From 3649b739991d079ee1669f02c60b3ee01c2877e1 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Mon, 02 Sep 2019 17:14:51 +0800
Subject: [PATCH] 空气质量对比

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

diff --git a/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java b/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java
index 7149776..8d78140 100644
--- a/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java
+++ b/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java
@@ -1,17 +1,27 @@
 package com.moral.mapper;
 
 import com.moral.entity.charts.DataCondition;
-import com.moral.entity.charts.PairData;
 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<PairData> selectLineChartDateByCrieria(@Param("sensorKey") String sensorKey, @Param("timePeriod") TimePeriod timePeriod, @Param("dataCondition") DataCondition dataCondition);
+    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