From 2ac80d588a68f60084d8bcc02aabd18c91100267 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 29 May 2018 14:50:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/HistoryMinutelyMapper.xml | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/HistoryMinutelyMapper.xml b/src/main/resources/mapper/HistoryMinutelyMapper.xml
index 4e9e4c3..70c57d3 100644
--- a/src/main/resources/mapper/HistoryMinutelyMapper.xml
+++ b/src/main/resources/mapper/HistoryMinutelyMapper.xml
@@ -13,15 +13,30 @@
FROM
history_minutely
WHERE
- mac = #{mac}
+ mac IN
+ (SELECT
+ d.mac
+ FROM
+ device d,
+ monitor_point mp
+ WHERE
+ d.is_delete = 0
+ AND d.monitor_point_id = mp.id
+ <if test="monitorPointId != null">
+ AND mp.id = #{monitorPointId}
+ </if>
+ <if test="mac != null">
+ AND d.mac = #{mac}
+ </if>
+ )
AND time >= #{start}
AND time < #{end}
</select>
<select id="getMonitorPointOrDeviceAvgData" resultType="java.util.Map">
SELECT
- DATE_FORMAT(time, #{typeFormat}) time,
- <foreach collection="sensorKeys" separator="," item="sensorKey">
+ DATE_FORMAT(time, #{typeFormat}) time
+ <foreach collection="sensorKeys" open="," separator="," item="sensorKey">
AVG(json->'$.${sensorKey}[0]') AS '${sensorKey}'
</foreach>
FROM
@@ -52,6 +67,9 @@
</if>
<if test="monitorPointId != null">
AND mp.id = #{monitorPointId}
+ </if>
+ <if test="professionId != null">
+ AND d.profession_id = #{professionId}
</if>
)
</if>
@@ -93,6 +111,9 @@
<if test='"DEVICE"==dataCondition.areaRange.toString()'>
and dev.id = #{dataCondition.areaRangeId}
</if>
+ <if test='"PROFESSION"==dataCondition.deviceDimension.toString()'>
+ and dev.profession_id = #{dataCondition.dimensionValue}
+ </if>
<if test='"MONITORPOINT"==dataCondition.areaRange.toString()'>
and mpt.id = #{dataCondition.areaRangeId}
</if>
--
Gitblit v1.8.0