From 4c872cea75d5b3c3832f0f0796ba727e8f91168d Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 21 Oct 2020 15:03:50 +0800
Subject: [PATCH] 增加获取单台设备五分钟平均值以及沧州环保局下属设备只显示十个参数

---
 src/main/resources/mapper/HistoryHourlyMapper.xml |   50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 50 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/HistoryHourlyMapper.xml b/src/main/resources/mapper/HistoryHourlyMapper.xml
index 5f6a59c..ceee292 100644
--- a/src/main/resources/mapper/HistoryHourlyMapper.xml
+++ b/src/main/resources/mapper/HistoryHourlyMapper.xml
@@ -52,4 +52,54 @@
         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`&gt;=#{startTime} and `time`&lt;#{endTime}
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0