From ee0e4c362e299f9be9a3859d0c142f26871cacf6 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 22 Dec 2017 15:12:10 +0800
Subject: [PATCH] Merge branch 'master' of ssh://blit.7drlb.com:29418/screen_api_v2
---
src/main/java/com/moral/service/HistoryService.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/service/HistoryService.java b/src/main/java/com/moral/service/HistoryService.java
index 985dd4e..feb611c 100644
--- a/src/main/java/com/moral/service/HistoryService.java
+++ b/src/main/java/com/moral/service/HistoryService.java
@@ -1,15 +1,18 @@
package com.moral.service;
+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);
- Map<String, Object> getAverageBySensor(Map<String, Object> parameters);
+ Map<String, Object> getDeviceRankingBySensorAverage(Map<String, Object> parameters);
Map<String, Object> getDayAQIByDevice(Map<String, Object> parameters);
Map<String, Object> getMonthAverageBySensor(Map<String, Object> parameters);
+
+ List<Map<String, Object>> getSensorsAverageByDevice4Report(Map<String, Object> parameters, List<Map<String, Object>> sensorKeys);
}
--
Gitblit v1.8.0