From a4c1346fe8b37507d69413632848d30a5826efc6 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Wed, 21 Nov 2018 09:25:08 +0800
Subject: [PATCH] 更新

---
 src/main/resources/mapper/HistoryMapper.xml |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/HistoryMapper.xml b/src/main/resources/mapper/HistoryMapper.xml
index be5b8cd..8cc81ab 100644
--- a/src/main/resources/mapper/HistoryMapper.xml
+++ b/src/main/resources/mapper/HistoryMapper.xml
@@ -139,4 +139,27 @@
 			time DESC 
 		LIMIT #{size}
 	</select>
+	
+	<select id="getActualDataByRegion" resultType="java.util.Map">
+		SELECT
+		<foreach collection="sensorKeys" separator="," item="sensorKey">
+			MAX( `value` ->> '$.${sensorKey}' ) * 1 AS '${sensorKey}' 
+		</foreach>
+		FROM
+			history h ,
+			device d,
+			monitor_point mp
+		<where>
+			h.mac = d.mac 
+			AND d.monitor_point_id = mp.id 
+		<if test="orgIds != null and orgIds.size &gt; 0">
+			AND mp.organization_id IN
+			<foreach  collection="orgIds" open="(" separator="," close=")" item="listItem">
+				#{listItem}
+			</foreach>
+		</if>
+			AND h.time >= #{start}			
+			AND h.time &lt; #{end}	
+		</where>
+	</select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0