From 05022bc66c5596c9230944f14f6c13d65c0a7430 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 20 Oct 2020 08:36:39 +0800
Subject: [PATCH] 修改获取六参接口在每五分钟的前二十秒无法获取数据的BUG
---
src/main/java/com/moral/service/HistoryMinutelyService.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/service/HistoryMinutelyService.java b/src/main/java/com/moral/service/HistoryMinutelyService.java
index 2408384..dea3a4f 100644
--- a/src/main/java/com/moral/service/HistoryMinutelyService.java
+++ b/src/main/java/com/moral/service/HistoryMinutelyService.java
@@ -17,9 +17,12 @@
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);
- List<Map<String, Object>> getAreaAvgDataByAreaCode(Map<String, Object> parameters) throws Exception;
+ Map<String, Object> getAverageBySensor(Map<String, Object> parameters);
Map<String, List<List<Double>>> queryLineChartDateByCrieria(LineChartCriteria lineChartCriteria);
@@ -30,4 +33,13 @@
List<Map<String, Object>> getDevicesAvgDataToExcel(Map<String, Object> parameters) throws Exception;
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>> getMultiDeviceSensorData(Map<String, Object> parameters) throws Exception;
+
+ List<Map<String, Object>> getFiveMinutesDataByMacsAndTime(Map<String, Object> parameters);
+
+ List<Map<String, Object>> getDevicesSensorsToExcel(Map<String, Object> parameters);
+
}
--
Gitblit v1.8.0