From 9009798abd7abfd726bcda80267c7d53dd3b8da3 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Wed, 12 Jun 2019 14:33:25 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
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 > 0">
+ AND mp.organization_id IN
+ <foreach collection="orgIds" open="(" separator="," close=")" item="listItem">
+ #{listItem}
+ </foreach>
+ </if>
+ AND h.time >= #{start}
+ AND h.time < #{end}
+ </where>
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0