From 30c76f1f25ddf6437014ea47bdc206cf0e288ec7 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 03 Nov 2021 14:23:09 +0800
Subject: [PATCH] screen-common 修改AQI工具类代码
---
screen-job/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 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 9b31a27..64e23c0 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
@@ -10,6 +10,7 @@
import com.moral.api.service.CityConfigService;
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.ComprehensiveIndexUtils;
@@ -86,14 +87,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.put("PM2_5", aqi.remove("pm25C"));
aqi.remove("pm25");
- aqi.put("pm10", aqi.remove("pm10C"));
- aqi.put("so2", aqi.remove("so2C"));
- aqi.put("no2", aqi.remove("no2C"));
- aqi.put("co", aqi.remove("coC"));
- aqi.put("o3", aqi.remove("o3C"));
- aqi.put("aqi", aqi.remove("value"));
+ aqi.put("PM10", aqi.remove("pm10C"));
+ aqi.put("SO2", aqi.remove("so2C"));
+ aqi.put("NO2", aqi.remove("no2C"));
+ aqi.put("CO", aqi.remove("coC"));
+ aqi.put("O3", aqi.remove("o3C"));
+ aqi.put("AQI", aqi.remove("value"));
//o3���������������
if (start != null) {
@@ -126,9 +127,16 @@
aqi.put("compositeIndex", compositeIndex);
//���������������������
- Map<String, Object> pollutant = AQIUtils.cityAqiPollutant(aqi);
- if (!ObjectUtils.isEmpty(pollutant)) {
- aqi.putAll(pollutant);
+ Map<String,Object> sixParamMap = new HashMap<>();
+ sixParamMap.put("a34002",aqi.get("PM10"));
+ sixParamMap.put("a34004",aqi.get("PM2_5"));
+ sixParamMap.put("a21004",aqi.get("NO2"));
+ sixParamMap.put("a21005",aqi.get("CO"));
+ sixParamMap.put("a05024",aqi.get("O3"));
+ sixParamMap.put("a21026",aqi.get("SO2"));
+ AQI aqiAndPollutant = AQIUtils.hourlyAQI(sixParamMap);
+ if (!ObjectUtils.isEmpty(aqiAndPollutant.getPrimaryPollutantNames())) {
+ aqi.put("pollutant",aqiAndPollutant.getPrimaryPollutantNames());
}
CityAqi cityAqi = new CityAqi();
--
Gitblit v1.8.0