From a66d53c3cbfb0024804045f4d795be06089d4f9d Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 03 Dec 2020 17:54:15 +0800
Subject: [PATCH] 五分钟表相关代码,平均风向、平局风速工具类

---
 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 b2e2035..3ed919d 100644
--- a/src/main/java/com/moral/service/HistoryService.java
+++ b/src/main/java/com/moral/service/HistoryService.java
@@ -13,6 +13,8 @@
 
     String queryValueByMacAndTime(String mac, Date time);
 
+    String getValueByMacAndTime(String mac, String time,String time1);
+
 	List<Map<String, Object>> getRegionRankingData(Map<String, Object> parameters);
 	
 	List<Map<String, Object>> getSensorsDataByDevice(Map<String, Object> parameters);
@@ -29,4 +31,14 @@
 	
 	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