From 43086924a890e1ae64ab98f9b844c3cf8a0b88c8 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 17 May 2018 17:21:19 +0800
Subject: [PATCH] 地图搜索功能增强
---
src/main/resources/mapper/HistoryMinutelyMapper.xml | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/HistoryMinutelyMapper.xml b/src/main/resources/mapper/HistoryMinutelyMapper.xml
index 4e9e4c3..2688dd2 100644
--- a/src/main/resources/mapper/HistoryMinutelyMapper.xml
+++ b/src/main/resources/mapper/HistoryMinutelyMapper.xml
@@ -20,8 +20,8 @@
<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 +52,9 @@
</if>
<if test="monitorPointId != null">
AND mp.id = #{monitorPointId}
+ </if>
+ <if test="professionId != null">
+ AND d.profession_id = #{professionId}
</if>
)
</if>
@@ -93,6 +96,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