From 3a46aae0a8e9e4bd3cb8dcd1185a69a74668995b Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 15 Dec 2020 14:08:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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