From f4ed03e33cd777996c697894c4075128546c3a74 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 06 Feb 2018 16:50:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/HistoryService.java | 7 +++----
1 files changed, 3 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..8c88967 100644
--- a/src/main/java/com/moral/service/HistoryService.java
+++ b/src/main/java/com/moral/service/HistoryService.java
@@ -5,11 +5,10 @@
public interface HistoryService {
- Map<String, Object> getAverageByAll(Map<String, Object> parameters);
+ Map<String, Object> getAllSensorAverageByDevice(Map<String, Object> parameters);
- Map<String, Object> getAverageBySensor(Map<String, Object> parameters);
-
- Map<String, Object> getDayAQIByDevice(Map<String, Object> parameters);
+ Map<String, Object> getDeviceRankingBySensorAverage(Map<String, Object> parameters);
Map<String, Object> getMonthAverageBySensor(Map<String, Object> parameters);
+
}
--
Gitblit v1.8.0