From 90f46db2793f5b242f13bf6959ab6c7f5a596c43 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Tue, 31 Mar 2020 13:50:04 +0800
Subject: [PATCH] 无人机和当天AQI分钟表改表

---
 src/main/java/com/moral/service/HistoryMinutelyService.java |   24 ++++++++++++++++--------
 1 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/moral/service/HistoryMinutelyService.java b/src/main/java/com/moral/service/HistoryMinutelyService.java
index f1dacc2..04eb222 100644
--- a/src/main/java/com/moral/service/HistoryMinutelyService.java
+++ b/src/main/java/com/moral/service/HistoryMinutelyService.java
@@ -1,21 +1,29 @@
 package com.moral.service;
 
-import com.moral.entity.charts.LineChartCriteria;
-import com.moral.entity.charts.PairData;
-
+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, List<Object>> getCompareReport(Map<String, Object> parameters) throws Exception;
+    Map<String, Object> getDayAQIByDevice(Map<String, Object> parameters);
+    
+    Map<String, Object> getHourAQIByDevice(Map<String, Object> parameters);
 
-	List<Map<String, Object>> getMonitorPointOrDeviceAvgData(Map<String, Object> parameters) throws Exception;
+    Map<String, List> getCompareReport(Map<String, Object> parameters) throws Exception;
 
-	Map<String, Object> getMonthAverageBySensor(Map<String, Object> parameters);
+    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;
+
 }

--
Gitblit v1.8.0