From 8dc1a393928b0195bf0b5a6d6f8daec6e4a043b1 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 18 Nov 2020 14:18:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/HistoryHourlyService.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/service/HistoryHourlyService.java b/src/main/java/com/moral/service/HistoryHourlyService.java
index 2d6f9f5..0e99fea 100644
--- a/src/main/java/com/moral/service/HistoryHourlyService.java
+++ b/src/main/java/com/moral/service/HistoryHourlyService.java
@@ -24,4 +24,8 @@
Map<String,Object> getDataByMac(String mac,String time);
List<Map<String, Object>> getDataByTimeSlot(String mac, String startTime, String endTime) throws Exception;
+
+ List<Map> getDataByMacAndTime(Map param);
+
+ List<Map> getDataAvbByMIdAndTime(String mId,String startTime,String endTime);
}
--
Gitblit v1.8.0