From 28b17e7a9b0bd3a8ed545aff4f077fe981db85d2 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 04 Jul 2018 17:13:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/HistoryService.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/moral/service/HistoryService.java b/src/main/java/com/moral/service/HistoryService.java
index feb611c..dec4d08 100644
--- a/src/main/java/com/moral/service/HistoryService.java
+++ b/src/main/java/com/moral/service/HistoryService.java
@@ -1,18 +1,17 @@
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>> getSensorsAverageByDevice4Report(Map<String, Object> parameters, List<Map<String, Object>> sensorKeys);
+ List<Map<String, Object>> getRegionRankingData(Map<String, Object> parameters);
}
--
Gitblit v1.8.0