From 1bd6a5e7678477f5b1fab449c6d618aae9041611 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Wed, 13 Feb 2019 11:13:19 +0800
Subject: [PATCH] 设备 相关更新

---
 src/main/resources/mapper/HistoryMinutelyMapper.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/HistoryMinutelyMapper.xml b/src/main/resources/mapper/HistoryMinutelyMapper.xml
index 1509a27..3a2d3c1 100644
--- a/src/main/resources/mapper/HistoryMinutelyMapper.xml
+++ b/src/main/resources/mapper/HistoryMinutelyMapper.xml
@@ -31,14 +31,14 @@
 		AND time &lt; #{end}
 	</select>
 	
-	<select id="getMonitorPointOrDeviceAvgData" resultType="java.util.LinkedHashMap">
+	<select id="getMonitorPointOrDeviceAvgData" resultType="java.util.Map">
 		SELECT
 			DATE_FORMAT(time, #{typeFormat}) time
 			<foreach  collection="sensorKeys" open="," separator="," item="sensorKey">
 				AVG(json->'$.${sensorKey}[0]') AS '${sensorKey}'
 			</foreach>
 		FROM
-			history_minutely h
+			history_${timeUnits} h
 		WHERE
 			h.time >= #{start}
 		AND h.time <![CDATA[<]]> #{end}

--
Gitblit v1.8.0