From 30d07fbe902f3013a65a7c00fa141b119610a8f7 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 22 Sep 2020 08:34:54 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/java/com/moral/mapper/HistoryMapper.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/mapper/HistoryMapper.java b/src/main/java/com/moral/mapper/HistoryMapper.java
index f15fe72..3b6d2ea 100644
--- a/src/main/java/com/moral/mapper/HistoryMapper.java
+++ b/src/main/java/com/moral/mapper/HistoryMapper.java
@@ -30,5 +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);
+
+ //���������������������������
+ 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