From 30d1267479ad9cb076cb2692befc6fe3a53fa7d9 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 25 Jul 2019 16:04:19 +0800
Subject: [PATCH] 删选监控站点和设备的因子

---
 src/main/java/com/moral/service/HistoryMinutelyService.java |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/moral/service/HistoryMinutelyService.java b/src/main/java/com/moral/service/HistoryMinutelyService.java
index b5a38c3..5fd32ee 100644
--- a/src/main/java/com/moral/service/HistoryMinutelyService.java
+++ b/src/main/java/com/moral/service/HistoryMinutelyService.java
@@ -1,15 +1,26 @@
 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);
 
-	List<Map<String, Object>> getMonitorPointOrDeviceAvgData4Excel(Map<String, Object> parameters) throws Exception;
+    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<Map<String, Object>> getSensorData(Map<String, Object> parameters) throws Exception;
 }

--
Gitblit v1.8.0