From f1374915909bb5bddb8d3a7fad84b3955fd69778 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Mon, 19 Aug 2019 16:55:17 +0800
Subject: [PATCH] 合并sql
---
src/main/resources/mapper/HistoryMinutelyMapper.xml | 33 +++++++++++----------------------
1 files changed, 11 insertions(+), 22 deletions(-)
diff --git a/src/main/resources/mapper/HistoryMinutelyMapper.xml b/src/main/resources/mapper/HistoryMinutelyMapper.xml
index 85ee9b4..1a0ba78 100644
--- a/src/main/resources/mapper/HistoryMinutelyMapper.xml
+++ b/src/main/resources/mapper/HistoryMinutelyMapper.xml
@@ -139,34 +139,23 @@
<!-- ���������sensor������ -->
<select id="getSensorData" resultType="java.util.LinkedHashMap">
SELECT
- <foreach collection="sensorKeys"
- item="sensorKey" separator="," close=",">
- hm.json->'$.${sensorKey}[0]' as '${sensorKey}'
+ DATE_FORMAT(hm.time,'%Y-%m-%d %H:%i:%s') time,
+ <foreach collection="sensorKeys" item="sensorKey" separator=",">
+ hm.json->'$.${sensorKey}[0]' as '${sensorKey}',
+ hm.json->'$.${sensorKey}[1]' as 'min${sensorKey}',
+ hm.json->'$.${sensorKey}[2]' as 'max${sensorKey}'
</foreach>
- DATE_FORMAT(hm.time,'%Y-%m-%d %H:%i:%s') as uavDate
FROM
history_minutely as hm
<where>
- <if test="mac!=null and mac!=''">
+ <if test="mac!=null">
and hm.mac=#{mac}
</if>
+ and hm.time >= #{startTime}
+ and hm.time <![CDATA[<=]]> #{endTime}
</where>
- <choose>
- <when test="startTime !=null and startTime != '' and endTime!=null and endTime !='' ">
- and hm.time >= #{startTime}
- and hm.time <![CDATA[<=]]> #{endTime}
- </when>
- <when test="startTime !=null and startTime != '' ">
- and hm.time >= #{startTime}
- </when>
- <when test="endTime !=null and endTime != '' ">
- and hm.time <![CDATA[<=]]> #{endTime}
- </when>
- <otherwise>
- and hm.time >= DATE_ADD(NOW(), INTERVAL -30 MINUTE)
- and hm.time <![CDATA[<=]]> now()
- </otherwise>
- </choose>
- ORDER BY hm.time
+ ORDER BY
+ hm.time
</select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0