From 9ed19d9bfc20d9661210c3398077852c9bc2d413 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Thu, 29 Mar 2018 14:08:56 +0800
Subject: [PATCH] 报表优化

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

diff --git a/src/main/resources/mapper/HistoryMinutelyMapper.xml b/src/main/resources/mapper/HistoryMinutelyMapper.xml
index 148f6a4..9fb4382 100644
--- a/src/main/resources/mapper/HistoryMinutelyMapper.xml
+++ b/src/main/resources/mapper/HistoryMinutelyMapper.xml
@@ -7,7 +7,9 @@
 	</resultMap>
 	<select id="getSersionAvgByDevice" resultType="java.util.Map">
 		SELECT
-			${sensorKeyColumn}
+			<foreach  collection="sensorKeys" separator="," item="sensorKey">
+				AVG(json->'$.${sensorKey}[0]') AS '${sensorKey}'
+			</foreach>
 		FROM
 			history_minutely
 		WHERE
@@ -19,7 +21,9 @@
 	<select id="getMonitorPointOrDeviceAvgData" resultType="java.util.Map">
 		SELECT
 			DATE_FORMAT(time, #{typeFormat}) time,
-			${sensorKeyColumn}
+			<foreach  collection="sensorKeys" separator="," item="sensorKey">
+				AVG(json->'$.${sensorKey}[0]') AS '${sensorKey}'
+			</foreach>
 		FROM
 			history_minutely h
 		WHERE

--
Gitblit v1.8.0