From 91c1c308abec43a67335cdebb574940ed41b09cf Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 05 Aug 2020 16:56:16 +0800
Subject: [PATCH] 修改预测参数，提交到数据库
---
src/main/resources/mapper/HistoryHourlyMapper.xml | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/HistoryHourlyMapper.xml b/src/main/resources/mapper/HistoryHourlyMapper.xml
index b428cba..aa83d96 100644
--- a/src/main/resources/mapper/HistoryHourlyMapper.xml
+++ b/src/main/resources/mapper/HistoryHourlyMapper.xml
@@ -56,10 +56,25 @@
<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 json from history_hourly where mac=#{mac} and time=#{time}
+ </select>
+
+ <select id="getBeamByMacs" resultType="java.util.Map">
+ SELECT
+ DATE_FORMAT(h.time,'%Y-%m-%d %H:%i:%s') 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>
+ and h.time >= #{start}
+ AND h.time <![CDATA[<]]> #{end}
+ and h.json->'$.e12[0]' is not null
+ group by DATE_FORMAT(h.time,'%Y-%m-%d %H:%i:%s')
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0