From 9009798abd7abfd726bcda80267c7d53dd3b8da3 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Wed, 12 Jun 2019 14:33:25 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/java/com/moral/service/HistoryService.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/moral/service/HistoryService.java b/src/main/java/com/moral/service/HistoryService.java
index feb611c..29cde9f 100644
--- a/src/main/java/com/moral/service/HistoryService.java
+++ b/src/main/java/com/moral/service/HistoryService.java
@@ -1,18 +1,24 @@
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>> getRegionRankingData(Map<String, Object> parameters);
+
+ List<Map<String, Object>> getSensorsDataByDevice(Map<String, Object> parameters);
- List<Map<String, Object>> getSensorsAverageByDevice4Report(Map<String, Object> parameters, List<Map<String, Object>> sensorKeys);
+ List<Map<String, Object>> getSensorDataBySensorKey(Map<String, Object> parameters);
+
+ Map<String, Object> getActualDataByRegion(Map<String, Object> parameters);
+
}
--
Gitblit v1.8.0