From 2bcbf240bd4419d01232967915295df61a8e1d84 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 19 Oct 2020 13:20:34 +0800
Subject: [PATCH] 删除测试websocket

---
 src/main/java/com/moral/mapper/HistoryMapper.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/moral/mapper/HistoryMapper.java b/src/main/java/com/moral/mapper/HistoryMapper.java
index 2779451..3b6d2ea 100644
--- a/src/main/java/com/moral/mapper/HistoryMapper.java
+++ b/src/main/java/com/moral/mapper/HistoryMapper.java
@@ -30,11 +30,16 @@
 
     List<Map<String, Object>> getCarSensorData(Map<String, Object> parameters);
 
+	List<Map<String, Object>> getUavSensorData(Map<String, Object> parameters);
+
     List<Map<String, Object>> listGetSensorData(Map<String, Object> parameters);
 
 	//���������������������������
-	String getO3AVG(Map<String, Object> parameters);
+	List<Map<String, Object>> getO3AVG(Map<String, Object> parameters);
 
 	int getNum(@Param("timef") String timef,
 			   @Param("timea") String timea);
+	String getJsonData(@Param("mac") String mac,
+					   @Param("time") String time,
+					   @Param("table") String table);
 }
\ No newline at end of file

--
Gitblit v1.8.0