From 2ac80d588a68f60084d8bcc02aabd18c91100267 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 29 May 2018 14:50:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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