From 90362d592d28927e5ab56f9b24f97d1f9089b50b Mon Sep 17 00:00:00 2001
From: cjl <chenjl@deyt.cn>
Date: Mon, 10 Jul 2023 21:36:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/qa' into qa
---
screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
index 8433ac1..0707182 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
@@ -219,7 +219,17 @@
wrapper.between("time", startDate, endDate);
List<HistoryHourly> historyHourlies = multiTableQuery(wrapper, tableNames);
historyHourlies = historyHourlies.stream().distinct().collect(Collectors.toList());
+ List<HistoryHourly> distinctHistoryHourlies = new ArrayList<>();
+ Map<String, Object> disMap = new HashMap<>();
for (HistoryHourly historyHourly:historyHourlies) {
+ Date time = historyHourly.getTime();
+ String timeStr = DateUtils.dateToDateString(time,DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
+ if (!disMap.containsKey(timeStr)){
+ distinctHistoryHourlies.add(historyHourly);
+ disMap.put(timeStr,true);
+ }
+ }
+ for (HistoryHourly historyHourly:distinctHistoryHourlies) {
Map<String,Object> historyHourlyMap = new HashMap<>();
historyHourlyMap.put("mac",mac);
JSONObject value = JSONObject.parseObject(historyHourly.getValue());
--
Gitblit v1.8.0