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/HistoryHourlyService.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/service/HistoryHourlyService.java b/src/main/java/com/moral/service/HistoryHourlyService.java
index 0e99fea..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;
@@ -27,5 +28,7 @@
List<Map> getDataByMacAndTime(Map param);
- List<Map> getDataAvbByMIdAndTime(String mId,String startTime,String endTime);
+ 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