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 | 74 ++++++++++++++++++++++++------------
1 files changed, 49 insertions(+), 25 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 1f91041..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;
@@ -26,6 +27,8 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.OptionalDouble;
+import java.util.stream.DoubleStream;
/**
* <p>
@@ -55,11 +58,20 @@
@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) {
+ start = DateUtils.addHours(time, -7);
+ }
+
//������������������
QueryWrapper<CityConfig> wrapper = new QueryWrapper<>();
wrapper.select("city_code", "city_id").eq("is_delete", Constants.NOT_DELETE);
List<CityConfig> list = cityConfigService.list(wrapper);
- Date time = DateUtils.dataToTimeStampTime(new Date(), DateUtils.yyyy_MM_dd_HH_EN);
+
for (CityConfig cityConfig : list) {
Integer cityCode = cityConfig.getCityCode();
Map<String, Object> data;
@@ -75,28 +87,35 @@
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���������������
- //���������������������������o3������
- QueryWrapper<CityAqi> queryWrapper = new QueryWrapper<>();
- queryWrapper.select("time", "value").eq("city_code", cityCode);
- List<Map<String, Object>> cityAqis = cityAqiMapper.selectMaps(queryWrapper);
- List<Map<String, Object>> o3_8H = AmendUtils.getO3_8H(cityAqis);
- if (!ObjectUtils.isEmpty(o3_8H)) {
- for (Map<String, Object> o3Map : o3_8H) {
- String hourTime = o3Map.get("time").toString();
- if (DateUtils.dateToDateString(time, DateUtils.yyyy_MM_dd_HH_mm_ss_EN).equals(hourTime)) {
- o3Map.get("o3");
- aqi.put("o3_8h", o3Map.get("o3"));
- break;
+ if (start != null) {
+ QueryWrapper<CityAqi> queryWrapper = new QueryWrapper<>();
+ queryWrapper.select("time", "value")
+ .eq("city_code", cityCode)
+ .ge("time", DateUtils.dateToDateString(start));
+ List<Map<String, Object>> cityAqis = cityAqiMapper.selectMaps(queryWrapper);
+ Map<String, Object> params = new HashMap<>();
+ params.put("time", DateUtils.dateToDateString(time,DateUtils.yyyy_MM_dd_HH_mm_ss_S_EN));
+ params.put("value", JSONObject.toJSONString(aqi));
+ cityAqis.add(params);
+ if (cityAqis.size() >= 6) {
+ OptionalDouble average = cityAqis.parallelStream().flatMapToDouble(v -> {
+ Map<String, Object> dataValue = JSONObject.parseObject((String) v.get("value"), Map.class);
+ double o3 = Double.parseDouble(dataValue.get("o3").toString());
+ return DoubleStream.of(o3);
+ }).average();
+ if (average.isPresent()) {
+ double o3_8h = AmendUtils.sciCal(average.getAsDouble(), 0);
+ aqi.put("o3_8h", o3_8h);
}
}
}
@@ -107,13 +126,18 @@
Double compositeIndex = ComprehensiveIndexUtils.dailyData(temp);
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();
cityAqi.setCityCode(cityCode);
--
Gitblit v1.8.0