From a332264920c9cd9226d566c19e36e5d5b5549c1b Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Mon, 12 Aug 2019 15:11:31 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/java/com/moral/mapper/HistoryMinutelyMapper.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java b/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java
index 049989c..57a5716 100644
--- a/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java
+++ b/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java
@@ -1,12 +1,26 @@
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> getDayAQIByDevice(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