From cd264145f9b4107f1430da46269dd306d26f3116 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 16 Nov 2020 13:16:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/HistoryMinutelyService.java | 60 +++++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 43 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/moral/service/HistoryMinutelyService.java b/src/main/java/com/moral/service/HistoryMinutelyService.java
index 7a1ca38..35be96b 100644
--- a/src/main/java/com/moral/service/HistoryMinutelyService.java
+++ b/src/main/java/com/moral/service/HistoryMinutelyService.java
@@ -1,17 +1,43 @@
-package com.moral.service;
-
-import java.util.List;
-import java.util.Map;
-
-public interface HistoryMinutelyService {
-
- Map<String, Object> getDayAQIByDevice(Map<String, Object> parameters);
-
- Map<String, List<Object>> getCompareReport(Map<String, Object> parameters) throws Exception;
-
- List<Map<String, Object>> getMonitorPointOrDeviceAvgData(Map<String, Object> parameters) throws Exception;
-
- Map<String, Object> getMonthAverageBySensor(Map<String, Object> parameters);
-
-
-}
+package com.moral.service;
+
+import java.text.ParseException;
+import java.util.List;
+import java.util.Map;
+
+import com.moral.entity.charts.LineChartCriteria;
+
+@SuppressWarnings("rawtypes")
+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;
+
+ List<Map<String, Object>> getMonitorPointOrDeviceAvgData(Map<String, Object> parameters) throws Exception;
+
+ List<Map<String, Object>> get(Map<String, Object> parameters) throws Exception;
+
+
+ Map<String, Object> getMonthAverageBySensor(Map<String, Object> parameters);
+
+ Map<String, Object> getAverageBySensor(Map<String, Object> parameters);
+
+ Map<String, List<List<Double>>> queryLineChartDateByCrieria(LineChartCriteria lineChartCriteria);
+
+ void convertQueryParam(Map<String, Object> parameters) throws ParseException;
+
+ List<List<Map<String, Object>>> getSensorData(Map<String, Object> parameters) throws Exception;
+
+ List<Map<String, Object>> getDevicesAvgDataToExcel(Map<String, Object> parameters) throws Exception;
+
+ List<Map<String, Object>> getDevicesSensorsAvgDataToExcel(Map<String, Object> parameters) throws Exception;
+
+ List<Map<String, Object>> get5MinutesOrHalfHour(Map<String, Object> parameters) throws ParseException;
+
+ List<Map<String, Object>> getMultiDeviceSensorData(Map<String, Object> parameters) throws Exception;
+
+ List<Map<String, Object>> getAllDeviceDataToExcel(Map<String, Object> parameters) throws Exception;
+
+}
--
Gitblit v1.8.0