From 65007f6811e580d8660340b8216296e68fae598c Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 01 Dec 2020 16:04:18 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/java/com/moral/service/HistoryService.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/service/HistoryService.java b/src/main/java/com/moral/service/HistoryService.java
index ea12763..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,8 +33,12 @@
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