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 | 41 +++--------------------------------------
1 files changed, 3 insertions(+), 38 deletions(-)
diff --git a/src/main/resources/mapper/HistoryMinutelyMapper.xml b/src/main/resources/mapper/HistoryMinutelyMapper.xml
index 770c396..1a0ba78 100644
--- a/src/main/resources/mapper/HistoryMinutelyMapper.xml
+++ b/src/main/resources/mapper/HistoryMinutelyMapper.xml
@@ -141,7 +141,9 @@
SELECT
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}[0]' as '${sensorKey}',
+ hm.json->'$.${sensorKey}[1]' as 'min${sensorKey}',
+ hm.json->'$.${sensorKey}[2]' as 'max${sensorKey}'
</foreach>
FROM
history_minutely as hm
@@ -156,41 +158,4 @@
hm.time
</select>
- <select id="getSensorDataMin" resultType="java.util.LinkedHashMap">
- SELECT
- DATE_FORMAT(hm.time,'%Y-%m-%d %H:%i:%s') time,
- <foreach collection="sensorKeys" item="sensorKey" separator=",">
- hm.json->'$.${sensorKey}[1]' as '${sensorKey}'
- </foreach>
- FROM
- history_minutely as hm
- <where>
- <if test="mac!=null">
- and hm.mac=#{mac}
- </if>
- and hm.time >= #{startTime}
- and hm.time <![CDATA[<=]]> #{endTime}
- </where>
- ORDER BY
- hm.time
- </select>
-
- <select id="getSensorDataMax" resultType="java.util.LinkedHashMap">
- SELECT
- DATE_FORMAT(hm.time,'%Y-%m-%d %H:%i:%s') time,
- <foreach collection="sensorKeys" item="sensorKey" separator=",">
- hm.json->'$.${sensorKey}[2]' as '${sensorKey}'
- </foreach>
- FROM
- history_minutely as hm
- <where>
- <if test="mac!=null">
- and hm.mac=#{mac}
- </if>
- and hm.time >= #{startTime}
- and hm.time <![CDATA[<=]]> #{endTime}
- </where>
- ORDER BY
- hm.time
- </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0