From 65007f6811e580d8660340b8216296e68fae598c Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 01 Dec 2020 16:04:18 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/java/com/moral/service/HistoryMinutelyService.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/service/HistoryMinutelyService.java b/src/main/java/com/moral/service/HistoryMinutelyService.java
index 9c60e09..35be96b 100644
--- a/src/main/java/com/moral/service/HistoryMinutelyService.java
+++ b/src/main/java/com/moral/service/HistoryMinutelyService.java
@@ -17,6 +17,9 @@
List<Map<String, Object>> getMonitorPointOrDeviceAvgData(Map<String, Object> parameters) throws Exception;
+ List<Map<String, Object>> get(Map<String, Object> parameters) throws Exception;
+
+
Map<String, Object> getMonthAverageBySensor(Map<String, Object> parameters);
Map<String, Object> getAverageBySensor(Map<String, Object> parameters);
@@ -31,6 +34,10 @@
List<Map<String, Object>> getDevicesSensorsAvgDataToExcel(Map<String, Object> parameters) throws Exception;
- List<Map<String,Object>> get5MinutesOrHalfHour(Map<String, Object> parameters) throws ParseException;
+ List<Map<String, Object>> get5MinutesOrHalfHour(Map<String, Object> parameters) throws ParseException;
+
+ List<Map<String, Object>> getMultiDeviceSensorData(Map<String, Object> parameters) throws Exception;
+
+ List<Map<String, Object>> getAllDeviceDataToExcel(Map<String, Object> parameters) throws Exception;
}
--
Gitblit v1.8.0