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/HistoryDailyServiceImpl.java | 11 +----------
1 files changed, 1 insertions(+), 10 deletions(-)
diff --git a/screen-job/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java
index 7f845eb..2dc5a04 100644
--- a/screen-job/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java
+++ b/screen-job/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java
@@ -85,11 +85,6 @@
dataMap.put("mac", mac);
dataMap.put("time", start);
- //���������������������������������������������������
- List<Map<String, Object>> tempValue = new ArrayList<>(value);
-
- //������������������������0������������O3������������������������������1���-8���
- value.removeIf(map -> ((Date) map.get("time")).getTime() == start.getTime());
Map<String, Object> params = new HashMap<>();
params.put("data", value);
params.put("type", "day");
@@ -131,12 +126,8 @@
if (!ObjectUtils.isEmpty(o3AvgOfDay)) {
jsonMap.putAll(o3AvgOfDay);
}
- //������������������������������������
- tempValue.removeIf(o -> ((Date) o.get("time")).getTime() == end.getTime());
//���������������������������
- params.put("data", tempValue);
-
Map<String, Object> windDirAvg = AmendUtils.getWindDirAvg(params);
if (!ObjectUtils.isEmpty(windDirAvg)) {
jsonMap.putAll(windDirAvg);
@@ -146,7 +137,7 @@
String sensorCode = sensor.getCode();
Double upper = sensor.getUpper();
Double lower = sensor.getLower();
- OptionalDouble optionalDouble = tempValue.parallelStream()
+ OptionalDouble optionalDouble = value.parallelStream()
.flatMapToDouble(v -> {
Map<String, Object> dataValue = JSONObject.parseObject((String) v.get("value"), Map.class);
Object sensorValue = dataValue.get(sensorCode);
--
Gitblit v1.8.0