From 4ffcc9ca554e2b541d5e00c2d61d5835708e2190 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Wed, 07 Nov 2018 10:14:23 +0800
Subject: [PATCH] 获取 组织下的监控点和设备数据

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

diff --git a/src/main/java/com/moral/service/HistoryService.java b/src/main/java/com/moral/service/HistoryService.java
index feb611c..29cde9f 100644
--- a/src/main/java/com/moral/service/HistoryService.java
+++ b/src/main/java/com/moral/service/HistoryService.java
@@ -1,18 +1,24 @@
 package com.moral.service;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
 
 public interface HistoryService {
 
-	Map<String, Object> getAllSensorAverageByDevice(Map<String, Object> parameters);
+	Map<String, Object> getAllSensorAverageByDevice(Map<String, Object> parameters) throws Exception;
 
 	Map<String, Object> getDeviceRankingBySensorAverage(Map<String, Object> parameters);
 
-	Map<String, Object> getDayAQIByDevice(Map<String, Object> parameters);
+    String queryValueByMacAndTime(String mac, Date time);
 
-	Map<String, Object> getMonthAverageBySensor(Map<String, Object> parameters);
+	List<Map<String, Object>> getRegionRankingData(Map<String, Object> parameters);
+	
+	List<Map<String, Object>> getSensorsDataByDevice(Map<String, Object> parameters);
 
-	List<Map<String, Object>> getSensorsAverageByDevice4Report(Map<String, Object> parameters, List<Map<String, Object>> sensorKeys);
+	List<Map<String, Object>> getSensorDataBySensorKey(Map<String, Object> parameters);
+
+	Map<String, Object> getActualDataByRegion(Map<String, Object> parameters);
+
 }

--
Gitblit v1.8.0