From f5765e4ff4ea188e8a6ba4d66f3c4e7fc2268fdd Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 02 Jul 2021 17:20:29 +0800
Subject: [PATCH] 定时任务update
---
screen-job/src/main/java/com/moral/api/service/impl/HistoryWeeklyServiceImpl.java | 28 ++++++----------------------
1 files changed, 6 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 af25905..a2cff3c 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
@@ -49,9 +49,10 @@
@Override
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,7 +60,7 @@
//���������������������������
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;
@@ -84,13 +85,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);
}
@@ -130,21 +131,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