From 0289e2c5349f6b2e8cf41126be7ff31381b3f1d5 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 19 Oct 2020 14:35:10 +0800
Subject: [PATCH] 多设备单因子数据及其平均值对比

---
 src/main/java/com/moral/service/HistoryService.java |    9 ++++++---
 1 files changed, 6 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..ebcae1f 100644
--- a/src/main/java/com/moral/service/HistoryService.java
+++ b/src/main/java/com/moral/service/HistoryService.java
@@ -31,9 +31,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