From 5fab4a685ce81fd2efa3546dc0716d223f9db09b Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 12 Nov 2021 13:48:37 +0800
Subject: [PATCH] 臭氧8小时滑动算法修改
---
screen-job/src/main/java/com/moral/api/service/impl/CityAqiDailyServiceImpl.java | 22 +++++++---------------
1 files changed, 7 insertions(+), 15 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 24a9006..2398263 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
@@ -60,7 +60,7 @@
QueryWrapper<CityAqi> wrapper = new QueryWrapper<>();
wrapper.select("city_code", "time", "value")
.ge("time", DateUtils.dateToDateString(start))
- .le("time", DateUtils.dateToDateString(end));
+ .lt("time", DateUtils.dateToDateString(end));
List<Map<String, Object>> dailyData = cityAqiService.listMaps(wrapper);
if (dailyData.size() == 0) {
@@ -74,24 +74,16 @@
CityAqiDaily cityAqiDaily = new CityAqiDaily();
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());
-
//O3���������������������������������������
- Double o3OfDay = AmendUtils.o3OfDay(value);
- if (o3OfDay != null) {
- jsonMap.put("O3", o3OfDay);
+ if (!ObjectUtils.isEmpty(value)) {
+ 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 = tempValue.parallelStream().flatMapToDouble(v -> {
+ OptionalDouble optionalDouble = value.parallelStream().flatMapToDouble(v -> {
Map<String, Object> dataValue = JSONObject.parseObject((String) v.get("value"), Map.class);
Object sensorValue = dataValue.get(sensor);
if (ObjectUtils.isEmpty(sensorValue)) {
--
Gitblit v1.8.0