From 80ed4c1a5a0b8d5a87cf0e5a0885e9267c3d28a3 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 26 Oct 2020 15:46:13 +0800
Subject: [PATCH] 修改websocketserver批量处理确认功能

---
 src/main/java/com/moral/service/HistoryService.java |   16 +++++++++++++++-
 1 files changed, 15 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..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);
@@ -25,6 +27,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