From ed8f0aeffb619c0540b16420320973207c55f015 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 23 Mar 2018 08:52:49 +0800
Subject: [PATCH] 地图点击关闭弹窗
---
src/main/resources/mapper/HistoryMinutelyMapper.xml | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/main/resources/mapper/HistoryMinutelyMapper.xml b/src/main/resources/mapper/HistoryMinutelyMapper.xml
index 2bbb17b..797834d 100644
--- a/src/main/resources/mapper/HistoryMinutelyMapper.xml
+++ b/src/main/resources/mapper/HistoryMinutelyMapper.xml
@@ -43,12 +43,14 @@
</select>
<select id="selectLineChartDateByCrieria" resultMap="PairDataResultMap">
SELECT
- <if test='"MINUTE"!=dataCondition.timeUnits.toString()'>
- AVG(json->'$.${sensorKey}[0]')
- </if>
- <if test='"MINUTE"==dataCondition.timeUnits.toString()'>
- json->'$.${sensorKey}[0]'
- </if>
+ <choose>
+ <when test="'MINUTE'==dataCondition.timeUnits.toString() and 'DEVICE'==dataCondition.areaRange.toString()">
+ json->'$.${sensorKey}[0]'
+ </when>
+ <otherwise>
+ AVG(json->'$.${sensorKey}[0]')
+ </otherwise>
+ </choose>
as value,
DATE_FORMAT(time,'${@com.moral.common.util.ReportTimeFormat@toMySqlTimeFormat(timePeriod.timeUnits)}') as format_time
FROM
@@ -70,7 +72,7 @@
and mpt.id = #{dataCondition.areaRangeId}
</if>
<if test='"PROVINCE"==dataCondition.areaRange.toString()'>
- and mpt.provice_code = #{dataCondition.areaRangeId}
+ and mpt.province_code = #{dataCondition.areaRangeId}
</if>
<if test='"CITY"==dataCondition.areaRange.toString()'>
and mpt.city_code = #{dataCondition.areaRangeId}
@@ -81,7 +83,7 @@
</where>
)
</where>
- <if test='"MINUTE"!=dataCondition.timeUnits.toString()'>
+ <if test="'MINUTE'!=dataCondition.timeUnits.toString() or 'DEVICE'!=dataCondition.areaRange.toString()">
GROUP BY format_time
</if>
ORDER BY format_time asc
--
Gitblit v1.8.0