From 2bc319c2c241d7646cb6805f9364cb7416edfa0a Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Mon, 22 Jun 2020 17:31:09 +0800
Subject: [PATCH] add websocket实时发送设备数据，显示风向等信息

---
 src/main/java/com/moral/service/HistoryService.java |   12 +++++++++++-
 1 files changed, 11 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..2ab5e0e 100644
--- a/src/main/java/com/moral/service/HistoryService.java
+++ b/src/main/java/com/moral/service/HistoryService.java
@@ -25,6 +25,16 @@
 	
 	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);
+
 
 }

--
Gitblit v1.8.0