From adde1ed1a99622c80a95dea83e294711d295c55c Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 08 Sep 2020 14:46:43 +0800
Subject: [PATCH] 微型站5分钟与半小时数据
---
src/main/resources/mapper/HistoryHourlyMapper.xml | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/HistoryHourlyMapper.xml b/src/main/resources/mapper/HistoryHourlyMapper.xml
index fc16813..bcd20eb 100644
--- a/src/main/resources/mapper/HistoryHourlyMapper.xml
+++ b/src/main/resources/mapper/HistoryHourlyMapper.xml
@@ -67,8 +67,8 @@
<select id="getBeamByMacs" resultType="java.util.Map">
SELECT
- DATE_FORMAT(h.time,'%Y-%m-%d %H:%i:%s') time,
- round(avg(h.json->'$.e12[0]'),0) beam
+ DATE_FORMAT(h.time,#{typeFormat}) time,
+ avg(h.json->'$.e12[0]') beam
FROM history_hourly h
WHERE h.mac in
<foreach item="item" collection="macs" index="index" open="(" separator="," close=")">#{item}</foreach>
@@ -77,4 +77,25 @@
and h.json->'$.e12[0]' is not null
group by DATE_FORMAT(h.time,'%Y-%m-%d %H:%i:%s')
</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,'%Y-%m-%d %H:%i:%s') time,
+ avg(h.json->'$.e17[0]') '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>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0