From d10235124e675103c1a27fb5aeff337493413cc2 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Thu, 22 Aug 2019 16:57:50 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/java/com/moral/service/HistoryMinutelyService.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/moral/service/HistoryMinutelyService.java b/src/main/java/com/moral/service/HistoryMinutelyService.java
index 0c106f6..04eb222 100644
--- a/src/main/java/com/moral/service/HistoryMinutelyService.java
+++ b/src/main/java/com/moral/service/HistoryMinutelyService.java
@@ -9,16 +9,21 @@
@SuppressWarnings("rawtypes")
public interface HistoryMinutelyService {
- Map<String, Object> getDayAQIByDevice(Map<String, Object> parameters);
-
- Map<String, List> getCompareReport(Map<String, Object> parameters) throws Exception;
+ Map<String, Object> getDayAQIByDevice(Map<String, Object> parameters);
+
+ Map<String, Object> getHourAQIByDevice(Map<String, Object> parameters);
- List<Map<String, Object>> getMonitorPointOrDeviceAvgData(Map<String, Object> parameters) throws Exception;
+ Map<String, List> getCompareReport(Map<String, Object> parameters) throws Exception;
- Map<String, Object> getMonthAverageBySensor(Map<String, Object> parameters);
+ List<Map<String, Object>> getMonitorPointOrDeviceAvgData(Map<String, Object> parameters) throws Exception;
+
+ Map<String, Object> getMonthAverageBySensor(Map<String, Object> parameters);
Map<String, List<List<Double>>> queryLineChartDateByCrieria(LineChartCriteria lineChartCriteria);
- void convertQueryParam(Map<String, Object> parameters) throws ParseException;
+ void convertQueryParam(Map<String, Object> parameters) throws ParseException;
+
+ List<List<Map<String, Object>>> getSensorData(Map<String, Object> parameters) throws Exception;
+
}
--
Gitblit v1.8.0