From 6fab467ce6ddad58de462f0094f86b044dfee94c Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 10 Aug 2020 11:50:54 +0800
Subject: [PATCH] 更新天气预测

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

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

--
Gitblit v1.8.0