From 267c20d552dbce24bce0a0d59a106f49f879ab62 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 03 Nov 2021 15:33:27 +0800
Subject: [PATCH] city_aqi，city_aqi_daily 6参转大写
---
screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java
index 03b92c6..466b0c5 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java
@@ -17,6 +17,7 @@
import com.moral.api.service.SysAreaService;
import com.moral.constant.Constants;
import com.moral.constant.RedisConstants;
+import com.moral.pojo.AQI;
import com.moral.util.AQIUtils;
import com.moral.util.AmendUtils;
import com.moral.util.DateUtils;
@@ -88,7 +89,7 @@
Date date = (Date) forecastDatum.get("time");
String value = forecastDatum.get("value").toString();
Map<String, Object> data = JSONObject.parseObject(value, Map.class);
- Object o3 = data.get("o3");
+ Object o3 = data.get("O3");
if (i == DateUtils.getHour(date) * 2) {
if (!ObjectUtils.isEmpty(o3)) {
map.put("O3", o3);
@@ -103,7 +104,7 @@
Date date = (Date) measuredDatum.get("time");
String value = measuredDatum.get("value").toString();
Map<String, Object> data = JSONObject.parseObject(value, Map.class);
- Object o3 = data.get("o3");
+ Object o3 = data.get("O3");
if (i == (DateUtils.getHour(date) * 2 + 1)) {
if (!ObjectUtils.isEmpty(o3)) {
map.put("O3", o3);
@@ -122,9 +123,9 @@
if (value == null)
value = queryCityAqiByRegionCodeFromDB(regionCode);
//������AQI������������������
- if (value == null || value.get("aqi") == null)
+ if (value == null || value.get("AQI") == null)
return null;
- Integer aqi = Integer.parseInt(value.get("aqi").toString());
+ Integer aqi = Integer.parseInt(value.get("AQI").toString());
String category = AQIUtils.classOfPollutionByAqi(aqi);
value.put("category", category);
return value;
@@ -172,7 +173,7 @@
continue;
}
Map<String, Object> allDataMap = JSON.parseObject(allDataJson, Map.class);
- Object aqiData = allDataMap.get("aqi");
+ Object aqiData = allDataMap.get("AQI");
if (aqiData == null)
result.put(key, "");
else
@@ -195,7 +196,10 @@
//���������������
Map<String, Object> sixParamAvg = calculate6ParamAvg(cityAqis);
//������������aqi������������������
- Map<String, Object> result = AQIUtils.hourlyAqi_pollutant(sixParamAvg);
+ Map<String, Object> result = new HashMap<>();
+ AQI aqi = AQIUtils.hourlyAQI(sixParamAvg);
+ result.put("aqi",aqi.getAQIValue());
+ result.put("pollutant",aqi.getPrimaryPollutantNames());
//���������������������
CityAqi lastCityAqi = cityAqis.get(cityAqis.size() - 1);
String time = DateUtils.dateToDateString(lastCityAqi.getTime(), "HH:mm");
--
Gitblit v1.8.0