From 5b830047d8db717372f32b9b475cc0b57ef186de Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 08 Nov 2021 11:21:07 +0800
Subject: [PATCH] city_aqi月年统计定时任务

---
 screen-job/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/screen-job/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java
index be072d3..b393684 100644
--- a/screen-job/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java
+++ b/screen-job/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java
@@ -83,8 +83,14 @@
 
             Map<String, Object> map = (Map<String, Object>) data.get("data");
             Map<String, Object> aqi = (Map<String, Object>) map.get("aqi");
-            aqi.put("PM2_5", aqi.remove("pm25C"));
             aqi.remove("pm25");
+            aqi.remove("pm10");
+            aqi.remove("so2");
+            aqi.remove("no2");
+            aqi.remove("co");
+            aqi.remove("o3");
+
+            aqi.put("PM2_5", aqi.remove("pm25C"));
             aqi.put("PM10", aqi.remove("pm10C"));
             aqi.put("SO2", aqi.remove("so2C"));
             aqi.put("NO2", aqi.remove("no2C"));
@@ -131,9 +137,8 @@
             sixParamMap.put(Constants.SENSOR_CODE_CO, aqi.get("CO"));
             sixParamMap.put(Constants.SENSOR_CODE_O3, aqi.get("O3"));
             AQI aqiAndPollutant = AQIUtils.hourlyAQI(sixParamMap);
-            if (!ObjectUtils.isEmpty(aqiAndPollutant.getPrimaryPollutantNames())) {
-                aqi.put("primaryPollutant", aqiAndPollutant.getPrimaryPollutantNames());
-            }
+            aqi.put("primaryPollutant", aqiAndPollutant.getPrimaryPollutantNames());
+
 
             CityAqi cityAqi = new CityAqi();
             cityAqi.setCityCode(cityCode);

--
Gitblit v1.8.0