From cda3fcb63a6cebb154a3770c4c6c288cd660d762 Mon Sep 17 00:00:00 2001
From: JinPengYong <812110275@qq.com>
Date: Sun, 26 Apr 2020 16:34:12 +0800
Subject: [PATCH] 国控因子与监测因子平均值对比

---
 src/main/java/com/moral/service/HistoryMinutelyService.java |   54 +++++++++++++++++++++++++++++++++---------------------
 1 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/moral/service/HistoryMinutelyService.java b/src/main/java/com/moral/service/HistoryMinutelyService.java
index 6fee90d..2408384 100644
--- a/src/main/java/com/moral/service/HistoryMinutelyService.java
+++ b/src/main/java/com/moral/service/HistoryMinutelyService.java
@@ -1,21 +1,33 @@
-package com.moral.service;
-
-import com.moral.entity.charts.LineChartCriteria;
-import com.moral.entity.charts.PairData;
-
-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);
-
-
-    Map<String, List<List<PairData>>> queryLineChartDateByCrieria(LineChartCriteria lineChartCriteria);
-}
+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);
+
+    List<Map<String, Object>> getAreaAvgDataByAreaCode(Map<String, Object> parameters) throws Exception;
+
+    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;
+}

--
Gitblit v1.8.0