From 6d1509ab9e5aa911a6a2cdc2ab5a0887210f0b41 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 12 Jul 2018 16:07:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/HistoryService.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/moral/service/HistoryService.java b/src/main/java/com/moral/service/HistoryService.java
index 985dd4e..1a28271 100644
--- a/src/main/java/com/moral/service/HistoryService.java
+++ b/src/main/java/com/moral/service/HistoryService.java
@@ -1,15 +1,22 @@
package com.moral.service;
+import java.util.Date;
+import java.util.List;
import java.util.Map;
public interface HistoryService {
- Map<String, Object> getAverageByAll(Map<String, Object> parameters);
+ Map<String, Object> getAllSensorAverageByDevice(Map<String, Object> parameters) throws Exception;
- Map<String, Object> getAverageBySensor(Map<String, Object> parameters);
+ 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>> getSensorDataBySensorKey(Map<String, Object> parameters);
+
}
--
Gitblit v1.8.0