From 746d419165c66d6a1f33a0a9df199e0b6daf3114 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 19 Oct 2020 16:18:05 +0800
Subject: [PATCH] 地图显示位置异常问题

---
 src/main/java/com/moral/service/HistoryMinutelyService.java |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/moral/service/HistoryMinutelyService.java b/src/main/java/com/moral/service/HistoryMinutelyService.java
index 7ce8b6f..dea3a4f 100644
--- a/src/main/java/com/moral/service/HistoryMinutelyService.java
+++ b/src/main/java/com/moral/service/HistoryMinutelyService.java
@@ -17,11 +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);
 
     Map<String, Object> getAverageBySensor(Map<String, Object> parameters);
-
-    List<Map<String, Object>> getAreaAvgDataByAreaCode(Map<String, Object> parameters) throws Exception;
 
     Map<String, List<List<Double>>> queryLineChartDateByCrieria(LineChartCriteria lineChartCriteria);
 
@@ -32,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