From dea78470f9f412f26b887827e94e46afc5d7bdbc Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 06 Aug 2021 14:37:47 +0800
Subject: [PATCH] 账号存在返回信息修改
---
screen-job/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java | 103 ++++++++++++---------------------------------------
1 files changed, 25 insertions(+), 78 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..fb62517 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,10 +11,12 @@
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;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import java.util.ArrayList;
@@ -46,15 +48,14 @@
@Autowired
private HistoryHourlyService historyHourlyService;
-
@Override
+ @Transactional
public void insertHistoryDaily() {
-
String format = DateUtils.yyyy_MM_dd_EN;
Date now = new Date();
- //������������
+ //���������������������
Date start = DateUtils.dataToTimeStampTime(DateUtils.getDateOfDay(now, -1), format);
- //������������
+ //���������������������
Date end = DateUtils.dataToTimeStampTime(now, format);
//������
QueryWrapper<Sensor> sensorQueryWrapper = new QueryWrapper<>();
@@ -65,6 +66,9 @@
QueryWrapper<HistoryHourly> historyHourlyQueryWrapper = new QueryWrapper<>();
historyHourlyQueryWrapper.ge("time", DateUtils.dateToDateString(start)).le("time", DateUtils.dateToDateString(end));
List<Map<String, Object>> dailyData = historyHourlyService.listMaps(historyHourlyQueryWrapper);
+ if (dailyData.size() == 0) {
+ return;
+ }
//���mac������
Map<String, List<Map<String, Object>>> data = dailyData.parallelStream().collect(Collectors.groupingBy(o -> (String) o.get("mac")));
@@ -82,14 +86,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,79 +114,16 @@
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<>();
- list.add(8);//1���
- list.add(12);//2
- list.add(10);//3
- list.add(18);//4
- list.add(16);//5
- list.add(22);//6
- list.add(4);//8
- list.add(12);
- list.add(28);
- list.add(26);
- list.add(25);
- list.add(21);
- list.add(6);
- list.add(18);
- list.add(28);
- list.add(18);
- list.add(16);
- list.add(15);
- list.add(12);
- list.add(14);
- list.add(12);
- list.add(10);
- list.add(5);
- list.add(88);
- Integer max = 0;
- for (int i = 7; i < list.size(); i++) {
- Integer sum = 0;
- for (int j = i - 7; j <= i; j++) {
- Integer b = list.get(j);
- sum = sum + b;
- }
- if (sum > max) {
- max = sum;
- }
- }
- System.out.println((max / 8F));
}
}
--
Gitblit v1.8.0