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/HistoryFiveMinutelyServiceImpl.java | 4 ++++
screen-job/src/main/java/com/moral/api/service/impl/HistoryWeeklyServiceImpl.java | 3 +++
screen-job/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java | 3 +++
screen-job/src/main/resources/mapper/HistoryMonthlyMapper.xml | 2 +-
screen-job/src/main/java/com/moral/api/service/impl/HistoryMonthlyServiceImpl.java | 4 +++-
5 files changed, 14 insertions(+), 2 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 40a1e1a..0d5044e 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
@@ -64,6 +64,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")));
diff --git a/screen-job/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java
index 1b3c45d..7b31e16 100644
--- a/screen-job/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java
+++ b/screen-job/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java
@@ -64,6 +64,10 @@
//���������������������5������������
List<Map<String, Object>> fiveMinutelyData = historyMinutelyService.getHistoryFiveMinutelyData(params);
+ if (fiveMinutelyData.size() == 0) {
+ return;
+ }
+
//���mac������
Map<String, List<Map<String, Object>>> data = fiveMinutelyData.parallelStream()
.collect(Collectors.groupingBy(o -> (String) o.get("mac")));
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..659841b 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
@@ -62,7 +62,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")));
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..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")));
diff --git a/screen-job/src/main/resources/mapper/HistoryMonthlyMapper.xml b/screen-job/src/main/resources/mapper/HistoryMonthlyMapper.xml
index 344a208..42db576 100644
--- a/screen-job/src/main/resources/mapper/HistoryMonthlyMapper.xml
+++ b/screen-job/src/main/resources/mapper/HistoryMonthlyMapper.xml
@@ -10,7 +10,7 @@
</resultMap>
<insert id="insertHistoryMonthly">
- INSERT INTO history_weekly
+ INSERT INTO history_monthly
VALUES
<foreach collection="list" item="item" separator=",">
(#{item.mac},#{item.time},#{item.value})
--
Gitblit v1.8.0