From 2b9c0e19babda8b4828d396bd0c2f97be3a0c0a4 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Wed, 05 Jun 2019 10:33:36 +0800
Subject: [PATCH] 增加根据选择参数返回检测因子的数值的Mapper接口

---
 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 ec3f36d..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);
 
 
-    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