From 3a46aae0a8e9e4bd3cb8dcd1185a69a74668995b Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 15 Dec 2020 14:08:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/impl/HistoryDailyServiceImpl.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/HistoryDailyServiceImpl.java b/src/main/java/com/moral/service/impl/HistoryDailyServiceImpl.java
index 97cc3ad..b053761 100644
--- a/src/main/java/com/moral/service/impl/HistoryDailyServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/HistoryDailyServiceImpl.java
@@ -129,4 +129,11 @@
return resultMap;
}
+ @Override
+ public List<Map<String, Object>> getDataByTimeSlot(String mac, String startTime, String endTime) throws Exception {
+ List<Map<String, Object>> resultMap = historyDailyMapper.getDataByTimeSlot(mac,startTime,endTime);
+ //System.out.println(resultMap);
+ return resultMap;
+ }
+
}
--
Gitblit v1.8.0