From 100e952066f126467e128a672fb6a7fc3cf367c3 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 08 Nov 2021 11:29:18 +0800
Subject: [PATCH] update
---
screen-api/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java | 55 ++++++++++++++++++++++++++++++++-----------------------
1 files changed, 32 insertions(+), 23 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 eb6fc95..357a1df 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");
@@ -212,12 +216,12 @@
* @Date: 2021/11/2
*/
private Map<String, Object> calculate6ParamAvg(List<CityAqi> cityAqiList) {
- Double co = calculateSensorAvg(cityAqiList, "co");
- Double pm2_5 = calculateSensorAvg(cityAqiList, "pm2_5");
- Double pm10 = calculateSensorAvg(cityAqiList, "pm10");
- Double so2 = calculateSensorAvg(cityAqiList, "so2");
- Double no2 = calculateSensorAvg(cityAqiList, "no2");
- Double o3 = calculateSensorAvg(cityAqiList, "o3");
+ Double co = calculateSensorAvg(cityAqiList, "CO");
+ Double pm2_5 = calculateSensorAvg(cityAqiList, "PM2_5");
+ Double pm10 = calculateSensorAvg(cityAqiList, "PM10");
+ Double so2 = calculateSensorAvg(cityAqiList, "SO2");
+ Double no2 = calculateSensorAvg(cityAqiList, "NO2");
+ Double o3 = calculateSensorAvg(cityAqiList, "O3");
Map<String, Object> result = new HashMap<>();
result.put(Constants.SENSOR_CODE_CO, co);
result.put(Constants.SENSOR_CODE_NO2, no2);
@@ -308,9 +312,8 @@
if (!ObjectUtils.isEmpty(one)) {
String value = one.getValue();
Map<String, Object> valueMap = JSONObject.parseObject(value, Map.class);
- rankMap.put("aqi", valueMap.get("aqi"));
+ rankMap.put("AQI", valueMap.get("AQI"));
}
-
//2.������������������������������������������������
queryWrapper.clear();
@@ -349,13 +352,15 @@
}
//���������������aqi������
- ranks.removeIf(o -> o.get("aqi") == null);
- sortByField(ranks, "aqi");
+ ranks.removeIf(o -> o.get("AQI") == null);
+ sortByField(ranks, "AQI");
//���������������
- Map<String, Object> dayMap = rankByField(ranks, cityCode, "aqi", cityCodes.size());
- if (!ObjectUtils.isEmpty(dayMap)) {
- dayMap.put("aqi", dayMap.remove("value"));
+ Map<String, Object> dayMap = rankByField(ranks, cityCode, "AQI", cityCodes.size());
+ if (ObjectUtils.isEmpty(dayMap)) {
+ dayMap.put("rank", null);
+ dayMap.put("size", null);
}
+ dayMap.put("AQI", dayMap.remove("value"));
result.put("day", dayMap);
//������������������������������
@@ -363,9 +368,11 @@
sortByField(ranks, "compositeIndexMonth");
//���������������
Map<String, Object> monthMap = rankByField(ranks, cityCode, "compositeIndexMonth", cityCodes.size());
- if (!ObjectUtils.isEmpty(monthMap)) {
- monthMap.put("compositeIndex", monthMap.remove("value"));
+ if (ObjectUtils.isEmpty(monthMap)) {
+ monthMap.put("rank", null);
+ monthMap.put("size", null);
}
+ monthMap.put("compositeIndex", monthMap.remove("value"));
result.put("month", monthMap);
//������������������������������
@@ -373,9 +380,11 @@
//���������������
sortByField(ranks, "compositeIndexYear");
Map<String, Object> yearMap = rankByField(ranks, cityCode, "compositeIndexYear", cityCodes.size());
- if(!ObjectUtils.isEmpty(yearMap)){
- yearMap.put("compositeIndex", yearMap.remove("value"));
+ if (ObjectUtils.isEmpty(yearMap)) {
+ yearMap.put("rank", null);
+ yearMap.put("size", null);
}
+ yearMap.put("compositeIndex", yearMap.remove("value"));
result.put("year", yearMap);
//���������������
--
Gitblit v1.8.0