From 120b501b7d42daf8b9432d84762feb8d730431b7 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 14 Aug 2018 09:33:19 +0800
Subject: [PATCH] 增加 监控站查询接口

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

diff --git a/src/main/java/com/moral/service/HistoryMinutelyService.java b/src/main/java/com/moral/service/HistoryMinutelyService.java
index 6fee90d..0c106f6 100644
--- a/src/main/java/com/moral/service/HistoryMinutelyService.java
+++ b/src/main/java/com/moral/service/HistoryMinutelyService.java
@@ -1,21 +1,24 @@
 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, 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<PairData>>> queryLineChartDateByCrieria(LineChartCriteria lineChartCriteria);
+    Map<String, List<List<Double>>> queryLineChartDateByCrieria(LineChartCriteria lineChartCriteria);
+
+	void convertQueryParam(Map<String, Object> parameters) throws ParseException;
 }

--
Gitblit v1.8.0