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/CityAqiServiceImpl.java | 16 ++++++----------
1 files changed, 6 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 1af915e..be072d3 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
@@ -53,14 +53,10 @@
@Autowired
private RedisTemplate redisTemplate;
- @Autowired
-
-
@Override
public void insertCityAqi() {
Date now = new Date();
Date time = DateUtils.dataToTimeStampTime(now, DateUtils.yyyy_MM_dd_HH_EN);
- String format = DateUtils.yyyy_MM_dd_EN;
Date start = null;
if (DateUtils.getHour(time) == 0 || DateUtils.getHour(time) >= 8) {
@@ -128,12 +124,12 @@
//���������������������
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"));
+ sixParamMap.put(Constants.SENSOR_CODE_PM25, aqi.get("PM2_5"));
+ sixParamMap.put(Constants.SENSOR_CODE_PM10, aqi.get("PM10"));
+ sixParamMap.put(Constants.SENSOR_CODE_SO2, aqi.get("SO2"));
+ sixParamMap.put(Constants.SENSOR_CODE_NO2, aqi.get("NO2"));
+ 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());
--
Gitblit v1.8.0