From fdc8e1e781851904b05f234523f372c8c1098b69 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 01 Jul 2021 11:42:45 +0800
Subject: [PATCH] 定时任务CO.O3算法
---
screen-job/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java | 57 ++++++++++++++++++++-------------------------------------
1 files changed, 20 insertions(+), 37 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 eec1a25..40a1e1a 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
@@ -11,6 +11,7 @@
import com.moral.api.service.HistoryHourlyService;
import com.moral.api.service.SensorService;
import com.moral.constant.Constants;
+import com.moral.util.AmendUtils;
import com.moral.util.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -46,10 +47,8 @@
@Autowired
private HistoryHourlyService historyHourlyService;
-
@Override
public void insertHistoryDaily() {
-
String format = DateUtils.yyyy_MM_dd_EN;
Date now = new Date();
//������������
@@ -82,14 +81,20 @@
List<Map<String, Object>> tempValue = new ArrayList<>(value);
value.removeIf(map -> ((Date) map.get("time")).getTime() == start.getTime());
- //������8���������������
- double o3AvgOfDay = getO3AvgOfDay(value);
- jsonMap.put(Constants.SENSOR_CODE_O3, o3AvgOfDay);
- System.out.println("������==" + value);
-
- //���������������������������
+ //������8������������������������������������
+ Object o3AvgOfDay = AmendUtils.getO3AvgOfDay(value);
+ if (o3AvgOfDay != null) {
+ jsonMap.put(Constants.SENSOR_CODE_O3, o3AvgOfDay);
+ }
+ //������������������������������������
tempValue.removeIf(map -> ((Date) map.get("time")).getTime() == end.getTime());
- System.out.println("������������==" + tempValue);
+
+ //���������������������������
+ Object windDirAvg = AmendUtils.getWindDirAvg(value);
+ if (windDirAvg != null) {
+ jsonMap.put(Constants.SENSOR_CODE_WIND_DIR, windDirAvg);
+ }
+
sensorCodes.forEach(sensorCode -> {
OptionalDouble optionalDouble = tempValue.parallelStream()
.flatMapToDouble(v -> {
@@ -104,41 +109,19 @@
return DoubleStream.of(Double.parseDouble(sensorValue.toString()));
}).average();
if (optionalDouble.isPresent()) {
- jsonMap.put(sensorCode.toString(), Double.parseDouble(String.format("%.4f", optionalDouble.getAsDouble())));
+ //���������������������
+ double sciCal = AmendUtils.sciCal(optionalDouble.getAsDouble(), 4);
+ jsonMap.put(sensorCode.toString(), sciCal);
}
});
dataMap.put("value", JSONObject.toJSONString(jsonMap));
insertData.add(dataMap);
});
- //������8���������������
- System.out.println(insertData);
+ //���������������
historyDailyMapper.insertHistoryDaily(insertData);
}
- //������8���������������
- private double getO3AvgOfDay(List<Map<String, Object>> list) {
- double max = 0d;
- for (int i = 8; i <= 24; i++) {
- List<Double> data = new ArrayList<>();
- for (Map<String, Object> dataMap : list) {
- Map<String, Object> dataValue = JSONObject.parseObject((String) dataMap.get("value"), Map.class);
- Double o3 = Double.parseDouble(dataValue.get(Constants.SENSOR_CODE_O3).toString());
- int hour = DateUtils.getHour((Date) dataMap.get("time"));
- if (hour == 0) {
- hour = 24;
- }
- if (hour <= i && hour >= i - 7) {
- data.add(o3);
- }
- }
- double average = data.stream().mapToDouble(aDouble -> aDouble).summaryStatistics().getAverage();
- if (max < average) {
- max = average;
- }
- }
- return Double.parseDouble(String.format("%.4f", max));
- }
public static void main(String[] args) {
List<Integer> list = new ArrayList<>();
@@ -148,7 +131,7 @@
list.add(18);//4
list.add(16);//5
list.add(22);//6
- list.add(4);//8
+ list.add(4);//7
list.add(12);
list.add(28);
list.add(26);
@@ -165,7 +148,7 @@
list.add(12);
list.add(10);
list.add(5);
- list.add(88);
+ list.add(88);//24
Integer max = 0;
for (int i = 7; i < list.size(); i++) {
Integer sum = 0;
--
Gitblit v1.8.0