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/CityAqiDailyServiceImpl.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 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 61a58ab..92b325d 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
@@ -9,12 +9,14 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.service.CityAqiService;
import com.moral.util.AmendUtils;
+import com.moral.util.ComprehensiveIndexUtils;
import com.moral.util.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
@@ -54,7 +56,7 @@
QueryWrapper<CityAqi> wrapper = new QueryWrapper<>();
wrapper.select("city_code", "time", "value")
.ge("time", DateUtils.dateToDateString(start))
- .lt("time", DateUtils.dateToDateString(end));
+ .le("time", DateUtils.dateToDateString(end));
List<Map<String, Object>> dailyData = cityAqiService.listMaps(wrapper);
if (dailyData.size() == 0) {
@@ -69,14 +71,21 @@
cityAqiDaily.setCityCode(Integer.parseInt(cityCode));
cityAqiDaily.setTime(start);
- //���������������������������
+ //���������������������������������������������������
+ List<Map<String, Object>> tempValue = new ArrayList<>(value);
+
+ //������������������������0������������O3������������������������������1���-8���
+ value.removeIf(map -> ((Date) map.get("time")).getTime() == start.getTime());
+
Double o3OfDay = AmendUtils.o3OfDay(value);
if (o3OfDay != null) {
jsonMap.put("o3", o3OfDay);
}
+ //������������������������������������
+ tempValue.removeIf(o -> ((Date) o.get("time")).getTime() == end.getTime());
sensors.forEach(sensor -> {
- OptionalDouble optionalDouble = value.parallelStream().flatMapToDouble(v -> {
+ OptionalDouble optionalDouble = tempValue.parallelStream().flatMapToDouble(v -> {
Map<String, Object> dataValue = JSONObject.parseObject((String) v.get("value"), Map.class);
//������������������
if ("o3".equals(sensor)) {
@@ -101,6 +110,11 @@
jsonMap.put(sensor, sciCal);
}
});
+
+ //���������������������
+ Double compositeIndex = ComprehensiveIndexUtils.dailyData(jsonMap);
+ jsonMap.put("compositeIndex", compositeIndex);
+
cityAqiDaily.setValue(JSONObject.toJSONString(jsonMap));
cityAqiDailyMapper.insert(cityAqiDaily);
});
--
Gitblit v1.8.0