From d0fe2eb9cefc7e3bfdddc5fa66633057c42697fc Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Wed, 18 Nov 2020 14:39:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/HistoryService.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/service/HistoryService.java b/src/main/java/com/moral/service/HistoryService.java
index fafef75..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);
@@ -24,5 +26,19 @@
Map<String, Object> getSensorUnitByDeviceMac(Map<String, Object> parameters);
Map<String, Object> gitHourlyAQIByMacAndTimeslot(Map<String, Object> parameters);
+
+ List<Map<String, Object>> getMointorPointRankByOrganizationId(Map<String, Object> parameters);
+
+ Map<String, Object> gitHourlyAQIByMonitorPointIdAndTimeslot(Map<String, Object> parameters);
+
+ 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