From de0d596acbf52dac0bbad75de7a809ee55ccc3b3 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Wed, 18 Nov 2020 11:52:37 +0800
Subject: [PATCH] update风场
---
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