From 67a7a24b47d71dd843dd0b17c5cdf9f519e29d5d Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Tue, 30 Jun 2020 13:20:25 +0800
Subject: [PATCH] update大屏左侧站点设备查询优化及设备因子名称显示null问题
---
src/main/java/com/moral/mapper/HistoryMinutelyMapper.java | 64 +++++++++++++++++---------------
1 files changed, 34 insertions(+), 30 deletions(-)
diff --git a/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java b/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java
index 64fcda7..ecb0b2d 100644
--- a/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java
+++ b/src/main/java/com/moral/mapper/HistoryMinutelyMapper.java
@@ -1,30 +1,34 @@
-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);
-
- List<Map<String, Object>> getSensorData2020(Map<String, Object> parameters);
-
- List<Map<String, Object>> getDevicesAvgDataToExcel(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);
+}
--
Gitblit v1.8.0