From caf3b68eaf742784b4b3ca995a34e542d1f91695 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 01 Jul 2021 17:31:40 +0800
Subject: [PATCH] update
---
screen-job/src/main/java/com/moral/api/service/impl/HistoryWeeklyServiceImpl.java | 5 ++++-
1 files changed, 4 insertions(+), 1 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 95bf167..af25905 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
@@ -61,6 +61,9 @@
QueryWrapper<HistoryDaily> historyDailyQueryWrapper = new QueryWrapper<>();
historyDailyQueryWrapper.ge("time", DateUtils.dateToDateString(start)).lt("time", DateUtils.dateToDateString(now));
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")));
@@ -86,7 +89,7 @@
jsonMap.put(Constants.SENSOR_CODE_CO, coAvg);
}
- //CO 90������������������������
+ //O3 90������������������������
Object o3Avg = AmendUtils.getO3AvgOfWeek(value);
if (o3Avg != null) {
jsonMap.put(Constants.SENSOR_CODE_O3, o3Avg);
--
Gitblit v1.8.0