From 25fae4a8608a91c5aae1db876a13cffd6418f573 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 30 Nov 2020 16:02:38 +0800
Subject: [PATCH] 删除测试代码
---
src/main/resources/mapper/HistoryHourlyMapper.xml | 135 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 112 insertions(+), 23 deletions(-)
diff --git a/src/main/resources/mapper/HistoryHourlyMapper.xml b/src/main/resources/mapper/HistoryHourlyMapper.xml
index 8f5404c..e74be91 100644
--- a/src/main/resources/mapper/HistoryHourlyMapper.xml
+++ b/src/main/resources/mapper/HistoryHourlyMapper.xml
@@ -10,10 +10,10 @@
history_hourly
<where>
<if test="mac!=null">
- AND mac=#{mac}
+ AND mac = #{mac}
</if>
<if test="time!=null">
- AND time= DATE_SUB(#{time}, INTERVAL 1 HOUR)
+ AND time = DATE_SUB(#{time}, INTERVAL 1 HOUR)
</if>
</where>
</select>
@@ -25,35 +25,124 @@
AVG(h.value ->'$.${sensorKey}') AS '${sensorKey}'
</foreach>
FROM
- history h
- <where>
- <if test="mac!=null">
- and h.mac=#{mac}
- </if>
- </where>
+ <if test="mac!=null and time!=null">
+ (select mac,value,time,version from history_${yearAndDay}
+ where mac = #{mac} and time BETWEEN DATE_SUB(#{time}, INTERVAL 1 HOUR) and #{time}) h
+ </if>
GROUP BY
DATE_FORMAT(time,'%Y-%m-%d %H')
<if test="time!=null">
- having time=DATE_FORMAT(DATE_SUB(#{time}, INTERVAL 1 HOUR),'%Y-%m-%d %H')
+ having time = DATE_FORMAT(DATE_SUB(#{time}, INTERVAL 1 HOUR),'%Y-%m-%d %H')
</if>
</select>
<select id="getPollutionSourceDataAll" resultType="java.util.Map">
- SELECT
- DATE_FORMAT(time,'%Y-%m-%d %H') time,
- <foreach collection="sensorKeys" separator="," item="sensorKey">
- AVG(h.value ->'$.${sensorKey}') AS '${sensorKey}'
- </foreach>
- FROM
- history h
- <where>
+ SELECT
+ DATE_FORMAT(time,'%Y-%m-%d %H') time,
+ <foreach collection="sensorKeys" separator="," item="sensorKey">
+ AVG(h.value ->'$.${sensorKey}') AS '${sensorKey}'
+ </foreach>
+ FROM
<if test="mac!=null">
- and h.mac=#{mac}
+ (select mac,value,time,version from history_${yearAndDay}
+ where mac = #{mac} and time BETWEEN DATE_SUB(#{time}, INTERVAL 1 DAY) and #{time}) h
</if>
- </where>
- GROUP BY
- DATE_FORMAT(time,'%Y-%m-%d %H')
- order by time desc
- limit 0,1
+ GROUP BY
+ DATE_FORMAT(time,'%Y-%m-%d %H')
+ order by time desc
+ limit 0,1
+ </select>
+
+ <select id="getTVOCByMac" resultType="java.lang.String">
+ select json->'$.${sensor}[0]' as e17 from history_hourly where mac=#{mac} and time=#{time}
+ </select>
+
+ <select id="getPressureByMac" resultType="java.lang.String">
+ select json->'$.e28[0]' as e28 from history_hourly where mac=#{mac} and time=#{time}
+ </select>
+
+ <select id="getDataByMac" resultType="java.util.Map">
+ select json from history_hourly where mac=#{mac} and time=#{time}
+ </select>
+
+ <select id="getBeamByMacs" resultType="java.util.Map">
+ SELECT
+ DATE_FORMAT(h.time,#{typeFormat}) time,
+ cast(AVG(h.json->'$.e12[0]') as UNSIGNED integer) 'beam'
+ FROM history_hourly h
+ WHERE h.mac in
+ <foreach item="item" collection="macs" index="index" open="(" separator="," close=")">#{item}</foreach>
+ and h.time >= #{start}
+ AND h.time <![CDATA[<]]> #{end}
+ and h.json->'$.e12[0]' is not null
+ group by h.time
+ </select>
+
+ <!-- ������������mac������������������������������������������������������ -->
+ <select id="getDataByTimeSlot" resultType="java.util.Map">
+ SELECT *
+ FROM history_hourly
+ where mac=#{mac}
+ AND time between #{startTime} and #{endTime}
+ </select>
+
+ <select id="getTVOCByMacs" resultType="java.util.Map">
+ SELECT
+ DATE_FORMAT(h.time,#{typeFormat}) time,
+ round(avg(h.json->'$.e17[0]'),3) 'TVOC'
+ FROM history_hourly h
+ WHERE h.mac in
+ <foreach item="item" collection="macs" index="index" open="(" separator="," close=")">#{item}</foreach>
+ and h.time >= #{start}
+ AND h.time <![CDATA[<]]> #{end}
+ and h.json->'$.e17[0]' is not null
+ group by h.time
+ </select>
+
+ <select id="getDataByMacAndTime" resultType="java.util.Map">
+ SELECT DATE_FORMAT(`time`,'%Y-%m-%d %H:%i:%s') as `time`,
+ json->'$.${sensor}[0]' as ${sensor}
+ FROM `history_hourly`
+ where `mac`=#{mac}
+ and `time`>=#{startTime}
+ and `time`<#{endTime}
+ </select>
+ <select id="getDataByMacAndTime1" resultType="java.util.Map">
+ SELECT DATE_FORMAT(`time`,'%Y-%m-%d %H:%i:%s') as `time`,json->'$.${sensor}[0]' as ${sensor} FROM `history_hourly` where `mac`=#{mac} and `time`>=#{startTime} and `time`<![CDATA[<]]>#{endTime}
+ </select>
+ <select id="getDataAvbByMIdAndTime" resultType="java.util.Map">
+ select hh.time as `time`,
+ AVG(hh.json->"$.e1[0]") as `PM2_5`,AVG(hh.json->"$.e2[0]") as 'PM10',AVG(hh.json->"$.e10[0]") as 'CO',
+ AVG(hh.json->"$.e11[0]") as 'SO2',AVG(hh.json->"$.e16[0]") as 'NO2',AVG(hh.json->"$.e15[0]") as 'O3'
+ from monitor_point mt,device d,history_hourly hh
+ where mt.id=d.monitor_point_id and d.mac=hh.mac and mt.id=#{mId} and hh.time>#{startTime} and hh.time<![CDATA[<=]]>#{endTime} GROUP BY hh.time;
+ </select>
+ <select id="getDataByMonitorPoints" resultType="java.util.Map">
+ select hh.time as `time`,
+ AVG(hh.json->"$.e1[0]") as `PM2_5`,AVG(hh.json->"$.e2[0]") as 'PM10',AVG(hh.json->"$.e10[0]") as 'CO',
+ AVG(hh.json->"$.e11[0]") as 'SO2',AVG(hh.json->"$.e16[0]") as 'NO2',AVG(hh.json->"$.e15[0]") as 'O3'
+ from monitor_point mt,device d,history_hourly hh
+ where mt.id=d.monitor_point_id and d.mac=hh.mac and mt.id in
+ <foreach collection="mIds" item="id" index="index" open="(" close=")" separator=",">
+ #{id}
+ </foreach>
+ and hh.time>#{startTime} and hh.time<![CDATA[<=]]>#{endTime} GROUP BY hh.time;
+ </select>
+ <select id="getAvgDataByMId" resultType="java.util.Map">
+ SELECT AVG(hh.json->"$.e1[0]") as `PM2_5`,AVG(hh.json->"$.e2[0]") as 'PM10',AVG(hh.json->"$.e10[0]") as 'CO',
+ AVG(hh.json->"$.e11[0]") as 'SO2',AVG(hh.json->"$.e16[0]") as 'NO2',AVG(hh.json->"$.e15[0]") as 'O3_day'
+ from monitor_point mt,device d,history_hourly hh where mt.id=d.monitor_point_id
+ and d.mac=hh.mac and mt.id =#{mId} and hh.time<![CDATA[<=]]>#{endTime} and hh.time>#{startTime}
+ </select>
+ <select id="getAvgDataByMIds" resultType="java.util.Map">
+ SELECT AVG(hh.json->"$.e1[0]") as `PM2_5`,AVG(hh.json->"$.e2[0]") as 'PM10',AVG(hh.json->"$.e10[0]") as 'CO',
+ AVG(hh.json->"$.e11[0]") as 'SO2',AVG(hh.json->"$.e16[0]") as 'NO2',AVG(hh.json->"$.e15[0]") as 'O3_day'
+ from monitor_point mt,device d,history_hourly hh where mt.id=d.monitor_point_id
+ and d.mac=hh.mac and mt.id in
+ <foreach collection="mIds" item="id" index="index" open="(" close=")" separator=",">
+ #{id}
+ </foreach>
+ and hh.time<![CDATA[<=]]>#{endTime} and hh.time>#{startTime}
+
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0