From ac670fcaf071f52ac886a4e52edb7c37d9f5d4fe Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 20 Oct 2020 13:27:24 +0800
Subject: [PATCH] 修改获取六参五分钟平均值bug

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

diff --git a/src/main/java/com/moral/service/HistoryService.java b/src/main/java/com/moral/service/HistoryService.java
index b619064..ebcae1f 100644
--- a/src/main/java/com/moral/service/HistoryService.java
+++ b/src/main/java/com/moral/service/HistoryService.java
@@ -25,6 +25,18 @@
 	
 	Map<String, Object> gitHourlyAQIByMacAndTimeslot(Map<String, Object> parameters);
 	
-	Map<String, Object> getMointorPointRankByOrganizationId(Map<String, Object> parameters);
+	List<Map<String, Object>> getMointorPointRankByOrganizationId(Map<String, Object> parameters);
+	
+	Map<String, Object> gitHourlyAQIByMonitorPointIdAndTimeslot(Map<String, Object> parameters);
+
+    List<List<Map<String, Object>>> getCarSensorData(Map<String, Object> parameters) throws Exception;
+
+	List<Map<String, Object>> getUavSensorData(Map<String, Object> parameters);
+
+    //������������������������������
+	List<Map<String, Object>> getO3AVG(Map<String, Object> parameters);
+
+	String getJsonData(String mac,String time,String table);
+
 
 }

--
Gitblit v1.8.0