From ce4f9a666b5845407687f9f4b8aeb4b457319bb4 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Mon, 19 Aug 2019 16:52:20 +0800
Subject: [PATCH] 合并最大值最小值到同一Mapper

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

diff --git a/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java b/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java
index cfc8941..8d78140 100644
--- a/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java
+++ b/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java
@@ -1,12 +1,27 @@
 package com.moral.mapper;
 
+import com.moral.entity.charts.DataCondition;
+import com.moral.entity.charts.TimePeriod;
+
+import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 import java.util.Map;
 
-public interface HistoryMinutelyMapper{
+public interface HistoryMinutelyMapper {
 
-	Map<String, Double> getSersionAvgByDevice(Map<String, Object> parameters);
+    Map<String, Double> getSersionAvgByDevice(Map<String, Object> parameters);
 
-	List<Map<String, Object>> getMonitorPointOrDeviceAvgData(Map<String, Object> parameters);
+    List<Map<String, Object>> getMonitorPointOrDeviceAvgData(Map<String, Object> parameters);
+
+    /**
+     * @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);
+
+    List<Map<String, Object>> getSensorData(Map<String, Object> parameters);
 
 }
\ No newline at end of file

--
Gitblit v1.8.0