From 0289e2c5349f6b2e8cf41126be7ff31381b3f1d5 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 19 Oct 2020 14:35:10 +0800
Subject: [PATCH] 多设备单因子数据及其平均值对比

---
 src/main/java/com/moral/service/HistoryMinutelyService.java |   72 +++++++++++++++++++++--------------
 1 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/src/main/java/com/moral/service/HistoryMinutelyService.java b/src/main/java/com/moral/service/HistoryMinutelyService.java
index 04eb222..1904618 100644
--- a/src/main/java/com/moral/service/HistoryMinutelyService.java
+++ b/src/main/java/com/moral/service/HistoryMinutelyService.java
@@ -1,29 +1,43 @@
-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;
-
-    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<List<Map<String, Object>>> getSensorData(Map<String, Object> parameters) throws Exception;
-
-}
+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>> getFiveMinutesDataByMacsAndTime(Map<String,Object> parameters);
+
+}

--
Gitblit v1.8.0