From adde1ed1a99622c80a95dea83e294711d295c55c Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 08 Sep 2020 14:46:43 +0800
Subject: [PATCH] 微型站5分钟与半小时数据

---
 src/main/java/com/moral/service/HistoryMinutelyService.java |   53 ++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 36 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..9c60e09 100644
--- a/src/main/java/com/moral/service/HistoryMinutelyService.java
+++ b/src/main/java/com/moral/service/HistoryMinutelyService.java
@@ -1,17 +1,36 @@
-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;
+
+    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;
+
+}

--
Gitblit v1.8.0