From 86916a5b7c8ed98221c03e440a9aad0f38109263 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 05 Sep 2018 09:52:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/HistoryService.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/service/HistoryService.java b/src/main/java/com/moral/service/HistoryService.java
index e08b6a6..29cde9f 100644
--- a/src/main/java/com/moral/service/HistoryService.java
+++ b/src/main/java/com/moral/service/HistoryService.java
@@ -1,6 +1,7 @@
package com.moral.service;
import java.util.Date;
+import java.util.List;
import java.util.Map;
@@ -11,4 +12,13 @@
Map<String, Object> getDeviceRankingBySensorAverage(Map<String, Object> parameters);
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);
+
}
--
Gitblit v1.8.0