From a613ae7c3165602fc8927c1ba6bb13edb25649c7 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Fri, 06 Nov 2020 12:38:08 +0800
Subject: [PATCH] 定时校准值插入

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

diff --git a/src/main/java/com/moral/service/HistoryService.java b/src/main/java/com/moral/service/HistoryService.java
index 5956c32..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);
@@ -31,9 +33,12 @@
 
     List<List<Map<String, Object>>> getCarSensorData(Map<String, Object> parameters) throws Exception;
 
-    //���������������������������
-	String getO3AVG(Map<String, Object> parameters);
+	List<Map<String, Object>> getUavSensorData(Map<String, Object> parameters);
 
-	int getNum(String timef,String timea);
+    //������������������������������
+	List<Map<String, Object>> getO3AVG(Map<String, Object> parameters);
+
+	String getJsonData(String mac,String time,String table);
+
 
 }

--
Gitblit v1.8.0