From 00e38ff225eb948f5234934afc01aa54c94e0de6 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Sat, 10 Oct 2020 11:29:36 +0800
Subject: [PATCH] update

---
 src/main/java/com/moral/mapper/HistoryMinutelyMapper.java |   63 ++++++++++++++++++-------------
 1 files changed, 37 insertions(+), 26 deletions(-)

diff --git a/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java b/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java
index 57a5716..516b9ec 100644
--- a/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java
+++ b/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java
@@ -1,26 +1,37 @@
-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 {
-
-    Map<String, Double> getSersionAvgByDevice(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
+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);
+
+    Map<String,Object> get5MiutesOrHalfHourByDay(Map<String, Object> parameters);
+
+}

--
Gitblit v1.8.0