From c97552b69c0af01aadc2580a59a46f58d5545985 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 15 Sep 2020 15:06:00 +0800
Subject: [PATCH] B/S登陆以及测试接口上传
---
src/main/java/com/moral/mapper/HistoryMinutelyMapper.java | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java b/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java
index 4e1b68f..516b9ec 100644
--- a/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java
+++ b/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java
@@ -10,25 +10,28 @@
public interface HistoryMinutelyMapper {
- Map<String, Double> getSersionAvgByDevice(Map<String, Object> parameters);
+ Map<String, Double> getSersionAvgByDevice(Map<String, Object> parameters);
- List<Map<String, Object>> getMonitorPointOrDeviceAvgData(Map<String, Object> parameters);
+ Map<String, Double> getAvgByDevice(Map<String, Object> parameters);
- List<Map<String, Object>> getAreaAvgDataByAreaCode(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);
+ /**
+ * @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>> 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);
+
}
--
Gitblit v1.8.0