From 27421fc5caadacc138db507bffae56a833555761 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Wed, 12 Aug 2020 16:00:30 +0800
Subject: [PATCH] 风场图update
---
src/main/resources/mapper/HistoryHourlyMapper.xml | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/HistoryHourlyMapper.xml b/src/main/resources/mapper/HistoryHourlyMapper.xml
index aa83d96..46f16e7 100644
--- a/src/main/resources/mapper/HistoryHourlyMapper.xml
+++ b/src/main/resources/mapper/HistoryHourlyMapper.xml
@@ -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