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/HistoryWeeklyServiceImpl.java | 33 +++++++++++----------------------
1 files changed, 11 insertions(+), 22 deletions(-)
diff --git a/screen-job/src/main/java/com/moral/api/service/impl/HistoryWeeklyServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/HistoryWeeklyServiceImpl.java
index b815c00..b19cd67 100644
--- a/screen-job/src/main/java/com/moral/api/service/impl/HistoryWeeklyServiceImpl.java
+++ b/screen-job/src/main/java/com/moral/api/service/impl/HistoryWeeklyServiceImpl.java
@@ -16,6 +16,7 @@
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;
@@ -48,10 +49,12 @@
private HistoryDailyService historyDailyService;
@Override
+ @Transactional
public void insertHistoryWeekly() {
- Date now = new Date();
//������������������������
- Date start = DateUtils.geLastWeekMonday();
+ Date start = DateUtils.getLastWeekMonday();
+ //������������������������
+ Date end = DateUtils.addDays(start, 7);
//������
QueryWrapper<Sensor> sensorQueryWrapper = new QueryWrapper<>();
sensorQueryWrapper.select("code").eq("is_delete", Constants.NOT_DELETE);
@@ -59,8 +62,11 @@
//���������������������������
QueryWrapper<HistoryDaily> historyDailyQueryWrapper = new QueryWrapper<>();
- historyDailyQueryWrapper.ge("time", DateUtils.dateToDateString(start)).lt("time", DateUtils.dateToDateString(now));
+ historyDailyQueryWrapper.ge("time", DateUtils.dateToDateString(start)).lt("time", DateUtils.dateToDateString(end));
List<Map<String, Object>> weeklyData = historyDailyService.listMaps(historyDailyQueryWrapper);
+ if (weeklyData.size() == 0) {
+ return;
+ }
//���mac������
Map<String, List<Map<String, Object>>> data = weeklyData.parallelStream().collect(Collectors.groupingBy(o -> (String) o.get("mac")));
@@ -81,13 +87,13 @@
}
//CO 95������������������������
- Object coAvg = AmendUtils.getCOAvgOfWeek(value);
+ Object coAvg = AmendUtils.getCOAvgOfWeekOrMonth(value);
if (coAvg != null) {
jsonMap.put(Constants.SENSOR_CODE_CO, coAvg);
}
//O3 90������������������������
- Object o3Avg = AmendUtils.getO3AvgOfWeek(value);
+ Object o3Avg = AmendUtils.getO3AvgOfWeekOrMonth(value);
if (o3Avg != null) {
jsonMap.put(Constants.SENSOR_CODE_O3, o3Avg);
}
@@ -127,21 +133,4 @@
//���������������
historyWeeklyMapper.insertHistoryWeekly(insertData);
}
-
- public static void main(String[] args) {
- List<Double> data = new ArrayList<>();
- data.add(7d);
- data.add(15d);
- data.add(36d);
- data.add(39d);
- data.add(40d);
- data.add(41d);
- data.add(20d);
- data.add(18d);
- System.out.println(data);
- System.out.println(AmendUtils.percentile(data, 95));
-
- }
-
-
}
--
Gitblit v1.8.0