From c2b226e7902dbb2b36f349612886ccc7333895e6 Mon Sep 17 00:00:00 2001
From: ZhuDongming <zdm773644075@hotmail.com>
Date: Mon, 19 Aug 2019 20:08:44 +0800
Subject: [PATCH] 合并查询无人机平均值,最小值和最大值

---
 src/main/java/com/moral/service/HistoryMinutelyService.java |   22 +++++++++++++++++-----
 1 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/moral/service/HistoryMinutelyService.java b/src/main/java/com/moral/service/HistoryMinutelyService.java
index 7a1ca38..04eb222 100644
--- a/src/main/java/com/moral/service/HistoryMinutelyService.java
+++ b/src/main/java/com/moral/service/HistoryMinutelyService.java
@@ -1,17 +1,29 @@
 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, 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