From 2e5ad6b6a97104693564ebc9108f58642386a362 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 03 Nov 2021 17:03:30 +0800
Subject: [PATCH] city_daily中aqi,首要污染物计算
---
screen-job/src/main/java/com/moral/api/service/impl/CityAqiDailyServiceImpl.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/screen-job/src/main/java/com/moral/api/service/impl/CityAqiDailyServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/CityAqiDailyServiceImpl.java
index 28a0fc0..fcde6f6 100644
--- a/screen-job/src/main/java/com/moral/api/service/impl/CityAqiDailyServiceImpl.java
+++ b/screen-job/src/main/java/com/moral/api/service/impl/CityAqiDailyServiceImpl.java
@@ -8,6 +8,7 @@
import com.moral.api.service.CityAqiDailyService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.service.CityAqiService;
+import com.moral.constant.Constants;
import com.moral.pojo.AQI;
import com.moral.util.AQIUtils;
import com.moral.util.AmendUtils;
@@ -120,16 +121,22 @@
}
});
- //���aqi������
- AQI aqi = AQIUtils.dailyAQI(jsonMap);
+ //���aqi,���������������������
+ Map<String, Object> sixParamMap = new HashMap<>();
+ sixParamMap.put(Constants.SENSOR_CODE_PM25, jsonMap.get("PM2_5"));
+ sixParamMap.put(Constants.SENSOR_CODE_PM10, jsonMap.get("PM10"));
+ sixParamMap.put(Constants.SENSOR_CODE_SO2, jsonMap.get("SO2"));
+ sixParamMap.put(Constants.SENSOR_CODE_NO2, jsonMap.get("NO2"));
+ sixParamMap.put(Constants.SENSOR_CODE_CO, jsonMap.get("CO"));
+ sixParamMap.put(Constants.SENSOR_CODE_O3, jsonMap.get("O3"));
+
+ AQI aqi = AQIUtils.dailyAQI(sixParamMap);
jsonMap.put("AQI", aqi.getAQIValue());
+ jsonMap.put("primaryPollutant", aqi.getPrimaryPollutantNames());
//���������������������
Double compositeIndex = ComprehensiveIndexUtils.dailyData(jsonMap);
jsonMap.put("compositeIndex", compositeIndex);
-
- //���������������������
- jsonMap.put("primaryPollutant", aqi.getPrimaryPollutantNames());
cityAqiDaily.setValue(JSONObject.toJSONString(jsonMap));
cityAqiDailyMapper.insert(cityAqiDaily);
--
Gitblit v1.8.0