From ef3a45a366ea8451f2581547fa6a3894bd1d672f Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Thu, 29 Aug 2019 10:33:35 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

---
 src/main/java/com/moral/service/HistoryService.java |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/moral/service/HistoryService.java b/src/main/java/com/moral/service/HistoryService.java
index dec4d08..b619064 100644
--- a/src/main/java/com/moral/service/HistoryService.java
+++ b/src/main/java/com/moral/service/HistoryService.java
@@ -14,4 +14,17 @@
     String queryValueByMacAndTime(String mac, Date time);
 
 	List<Map<String, Object>> getRegionRankingData(Map<String, Object> parameters);
+	
+	List<Map<String, Object>> getSensorsDataByDevice(Map<String, Object> parameters);
+
+	List<Map<String, Object>> getSensorDataBySensorKey(Map<String, Object> parameters);
+
+	Map<String, Object> getActualDataByRegion(Map<String, Object> parameters);
+
+	Map<String, Object> getSensorUnitByDeviceMac(Map<String, Object> parameters);
+	
+	Map<String, Object> gitHourlyAQIByMacAndTimeslot(Map<String, Object> parameters);
+	
+	Map<String, Object> getMointorPointRankByOrganizationId(Map<String, Object> parameters);
+
 }

--
Gitblit v1.8.0