From 9485a0cb33bb4535bb553a5bf49debeadbe0c89d Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 03 Nov 2021 11:48:55 +0800
Subject: [PATCH] city_aqi o3_8h，综指，首要污染物计算
---
screen-job/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java | 46 +++++++++++++++++++++++++++++++---------------
1 files changed, 31 insertions(+), 15 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..9b31a27 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
@@ -26,6 +26,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 +57,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;
@@ -85,18 +96,25 @@
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 +125,11 @@
Double compositeIndex = ComprehensiveIndexUtils.dailyData(temp);
aqi.put("compositeIndex", compositeIndex);
-
//���������������������
Map<String, Object> pollutant = AQIUtils.cityAqiPollutant(aqi);
if (!ObjectUtils.isEmpty(pollutant)) {
aqi.putAll(pollutant);
}
-
CityAqi cityAqi = new CityAqi();
cityAqi.setCityCode(cityCode);
--
Gitblit v1.8.0