From 9b02f67b17b9dcbd798862021ac0a516d1ba69b3 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Fri, 06 Nov 2020 15:37:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/HistoryHourlyService.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/service/HistoryHourlyService.java b/src/main/java/com/moral/service/HistoryHourlyService.java
index ad011f6..ded5838 100644
--- a/src/main/java/com/moral/service/HistoryHourlyService.java
+++ b/src/main/java/com/moral/service/HistoryHourlyService.java
@@ -1,5 +1,6 @@
package com.moral.service;
+import java.util.List;
import java.util.Map;
import com.moral.entity.Point;
@@ -21,4 +22,8 @@
//������historyHourly���������������
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);
}
--
Gitblit v1.8.0