From c1d5a17611252e3b0fe8c159f2dde970e837455c Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 05 Jul 2021 14:29:14 +0800
Subject: [PATCH] screen-manage 实时数据界面改为传递code
---
screen-job/src/main/java/com/moral/api/service/impl/HistoryMonthlyServiceImpl.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/screen-job/src/main/java/com/moral/api/service/impl/HistoryMonthlyServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/HistoryMonthlyServiceImpl.java
index 07a109b..16f1cac 100644
--- a/screen-job/src/main/java/com/moral/api/service/impl/HistoryMonthlyServiceImpl.java
+++ b/screen-job/src/main/java/com/moral/api/service/impl/HistoryMonthlyServiceImpl.java
@@ -49,10 +49,10 @@
@Override
public void insertHistoryMonthly() {
-
- Date now = new Date();
//���������������������1���
Date start = DateUtils.getFirstDayOfLastMonth();
+ //���������������������1���
+ Date end = DateUtils.addMonths(start, 1);
//������
QueryWrapper<Sensor> sensorQueryWrapper = new QueryWrapper<>();
sensorQueryWrapper.select("code").eq("is_delete", Constants.NOT_DELETE);
@@ -60,9 +60,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")));
@@ -82,13 +84,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,7 +129,5 @@
//���������������
historyMonthlyMapper.insertHistoryMonthly(insertData);
-
-
}
}
--
Gitblit v1.8.0