From a13506f193f38720ae2729f9c2ceb35bf9fdb898 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 28 Sep 2020 11:50:05 +0800
Subject: [PATCH] 更新获取风向和设备信息，添加经纬度，修改rabbit MQ代码。

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

diff --git a/src/main/java/com/moral/service/HistoryService.java b/src/main/java/com/moral/service/HistoryService.java
index b41a7eb..ebcae1f 100644
--- a/src/main/java/com/moral/service/HistoryService.java
+++ b/src/main/java/com/moral/service/HistoryService.java
@@ -26,5 +26,17 @@
 	Map<String, Object> gitHourlyAQIByMacAndTimeslot(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