From 3aa2f5aa4c7963e7bcfbc0d710c286c826338df9 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 02 Dec 2020 14:39:08 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

---
 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 ded5838..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;
 
@@ -26,4 +27,8 @@
     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