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/mapper/HistoryMinutelyMapper.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java b/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java
index ca530b5..ca65349 100644
--- a/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java
+++ b/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java
@@ -16,8 +16,6 @@
List<Map<String, Object>> getMonitorPointOrDeviceAvgData(Map<String, Object> parameters);
- List<Map<String, Object>> getAreaAvgDataByAreaCode(Map<String, Object> parameters);
-
/**
* @param sensorKeys
* @param timePeriod
@@ -33,4 +31,8 @@
List<Map<String, Object>> getDevicesAvgDataToExcel(Map<String, Object> parameters);
List<Map<String, Object>> getDevicesSensorsAvgDataToExcel(Map<String, Object> parameters);
+
+ Map<String, Object> get5MiutesOrHalfHourByDay(Map<String, Object> parameters);
+
+ List<Map<String, Object>> getMultiDeviceSensorData(Map<String, Object> parameters);
}
--
Gitblit v1.8.0