From 69b69b4c90b66a4b82dee7da6c63f835c10caef3 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Thu, 26 Apr 2018 21:40:45 +0800
Subject: [PATCH] 修改ftp服务器

---
 src/main/java/com/moral/mapper/HistoryMinutelyMapper.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java b/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java
index 7149776..ee03fe0 100644
--- a/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java
+++ b/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java
@@ -13,5 +13,13 @@
 	Map<String, Double> getSersionAvgByDevice(Map<String, Object> parameters);
 
 	List<Map<String, Object>> getMonitorPointOrDeviceAvgData(Map<String, Object> parameters);
-    List<PairData> selectLineChartDateByCrieria(@Param("sensorKey") String sensorKey, @Param("timePeriod") TimePeriod timePeriod, @Param("dataCondition") DataCondition dataCondition);
+
+	/**
+	 *
+	 * @param sensorKeys
+	 * @param timePeriod
+	 * @param dataCondition
+	 * @return {format_time:string,e1:double,e2...............}
+	 */
+    List<Map<String, Object>> selectLineChartDateByCrieria(@Param("sensorKeys")List<String> sensorKeys, @Param("timePeriod") TimePeriod timePeriod, @Param("dataCondition") DataCondition dataCondition);
 }
\ No newline at end of file

--
Gitblit v1.8.0