From 3df4f24049c8b3e4c36fde16a67a436ce37f00ad Mon Sep 17 00:00:00 2001
From: JinPengYong <812110275@qq.com>
Date: Sun, 26 Apr 2020 16:18:30 +0800
Subject: [PATCH] Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.
---
src/main/java/com/moral/service/HistoryMinutelyService.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/moral/service/HistoryMinutelyService.java b/src/main/java/com/moral/service/HistoryMinutelyService.java
index 90f86d8..ae7b1d4 100644
--- a/src/main/java/com/moral/service/HistoryMinutelyService.java
+++ b/src/main/java/com/moral/service/HistoryMinutelyService.java
@@ -10,7 +10,7 @@
public interface HistoryMinutelyService {
Map<String, Object> getDayAQIByDevice(Map<String, Object> parameters);
-
+
Map<String, Object> getHourAQIByDevice(Map<String, Object> parameters);
Map<String, List> getCompareReport(Map<String, Object> parameters) throws Exception;
@@ -19,14 +19,13 @@
Map<String, Object> getMonthAverageBySensor(Map<String, Object> parameters);
-
Map<String, List<List<Double>>> queryLineChartDateByCrieria(LineChartCriteria lineChartCriteria);
void convertQueryParam(Map<String, Object> parameters) throws ParseException;
- List<Map<String, Object>> getSensorData(Map<String, Object> parameters) throws Exception;
+ List<List<Map<String, Object>>> getSensorData(Map<String, Object> parameters) throws Exception;
- List<Map<String, Object>> getSensorDataMin(Map<String, Object> parameters) throws Exception;
+ List<Map<String, Object>> getDevicesAvgDataToExcel(Map<String, Object> parameters) throws Exception;
- List<Map<String, Object>> getSensorDataMax(Map<String, Object> parameters) throws Exception;
+ List<Map<String, Object>> getDevicesSensorsAvgDataToExcel(Map<String, Object> parameters) throws Exception;
}
--
Gitblit v1.8.0