From 4c872cea75d5b3c3832f0f0796ba727e8f91168d Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 21 Oct 2020 15:03:50 +0800
Subject: [PATCH] 增加获取单台设备五分钟平均值以及沧州环保局下属设备只显示十个参数

---
 src/main/java/com/moral/service/HistoryMinutelyService.java |   75 ++++++++++++++++++++++---------------
 1 files changed, 44 insertions(+), 31 deletions(-)

diff --git a/src/main/java/com/moral/service/HistoryMinutelyService.java b/src/main/java/com/moral/service/HistoryMinutelyService.java
index ae7b1d4..7e8e0c2 100644
--- a/src/main/java/com/moral/service/HistoryMinutelyService.java
+++ b/src/main/java/com/moral/service/HistoryMinutelyService.java
@@ -1,31 +1,44 @@
-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;
-
-    List<Map<String, Object>> getDevicesAvgDataToExcel(Map<String, Object> parameters) throws Exception;
-
-    List<Map<String, Object>> getDevicesSensorsAvgDataToExcel(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>> getDevicesSensorsToExcel(Map<String, Object> parameters);
+
+}

--
Gitblit v1.8.0