From 1d7e1b771160dd8b7f25765e402ce25cac676641 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 24 Nov 2020 15:58:33 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/java/com/moral/service/HistoryHourlyService.java | 7 +++++++
1 files changed, 7 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..c5b5881 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.lang.reflect.Array;
import java.util.List;
import java.util.Map;
@@ -24,4 +25,10 @@
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<String,Object>> getDataAvbByMIdAndTime(String mId,String startTime,String endTime);
+ List<Map<String,Object>> getDataByMonitorPoints(String[] mIds, String startTime, String endTime);
+ Map<String,Object> getAvgDataByMId(String mId,String startTime,String endTime);
}
--
Gitblit v1.8.0