From 2bcbf240bd4419d01232967915295df61a8e1d84 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 19 Oct 2020 13:20:34 +0800
Subject: [PATCH] 删除测试websocket
---
src/main/java/com/moral/mapper/HistoryMinutelyMapper.java | 70 +++++++++++++++++++----------------
1 files changed, 38 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java b/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java
index 0b09df2..ca65349 100644
--- a/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java
+++ b/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java
@@ -1,32 +1,38 @@
-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);
-
- 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);
-
- 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);
-}
\ 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);
+
+ List<Map<String, Object>> getMultiDeviceSensorData(Map<String, Object> parameters);
+}
--
Gitblit v1.8.0