From f28149d8183a62f87fa9c8df9ae589070d83f612 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Thu, 24 Dec 2020 13:47:50 +0800
Subject: [PATCH] 波动补偿

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

diff --git a/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java b/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java
index 12ba243..ca65349 100644
--- a/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java
+++ b/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java
@@ -10,27 +10,29 @@
 
 public interface HistoryMinutelyMapper {
 
-  Map<String, Double> getSersionAvgByDevice(Map<String, Object> parameters);
+    Map<String, Double> getSersionAvgByDevice(Map<String, Object> parameters);
 
-  Map<String, Double> getAvgByDevice(Map<String, Object> parameters);
+    Map<String, Double> getAvgByDevice(Map<String, Object> parameters);
 
-  List<Map<String, Object>> getMonitorPointOrDeviceAvgData(Map<String, Object> parameters);
+    List<Map<String, Object>> getMonitorPointOrDeviceAvgData(Map<String, Object> parameters);
 
-  List<Map<String, Object>> getAreaAvgDataByAreaCode(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);
 
-  /**
-   * @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);
 
-  List<Map<String, Object>> getSensorData(Map<String, Object> parameters);
+    List<Map<String, Object>> getSensorData2020(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>> getDevicesAvgDataToExcel(Map<String, Object> parameters);
+    List<Map<String, Object>> getDevicesSensorsAvgDataToExcel(Map<String, Object> parameters);
 
-  List<Map<String, Object>> getDevicesSensorsAvgDataToExcel(Map<String, Object> parameters);
+    Map<String, Object> get5MiutesOrHalfHourByDay(Map<String, Object> parameters);
+
+    List<Map<String, Object>> getMultiDeviceSensorData(Map<String, Object> parameters);
 }

--
Gitblit v1.8.0