From 8ea24dd5fb6e1b24d3a7ef62a0060ef516f8f759 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Thu, 24 May 2018 08:58:16 +0800
Subject: [PATCH] 更新 监测点 数据

---
 src/main/java/com/moral/service/HistoryMinutelyService.java |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

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

--
Gitblit v1.8.0