From 5c3994e0166baff540d323a779573299a56feec6 Mon Sep 17 00:00:00 2001
From: yuzixiang <yzx123456>
Date: Fri, 22 May 2020 15:38:10 +0800
Subject: [PATCH] 计算臭氧平缓平均值（更新）
---
src/main/resources/mapper/HistoryMapper.xml | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/mapper/HistoryMapper.xml b/src/main/resources/mapper/HistoryMapper.xml
index 603a438..0ab705d 100644
--- a/src/main/resources/mapper/HistoryMapper.xml
+++ b/src/main/resources/mapper/HistoryMapper.xml
@@ -254,15 +254,17 @@
ORDER BY
h.time
</select>
- <select id="getO3AVG" resultType="java.lang.String">
- select AVG(history_hourly.json->'$.e15[0]')
- FROM history_hourly
- where time <![CDATA[>=]]>#{frontTime}
- and time <![CDATA[<]]>#{afterTime}
- and mac=#{mac}
- </select>
+
<select id="getNum" resultType="java.lang.Integer">
select count(*) from history_hourly where time <![CDATA[>=]]> #{timef} and time <![CDATA[<=]]> #{timea}
</select>
+ <select id="getO3AVG" resultType="java.util.LinkedHashMap">
+ select DATE_FORMAT(time,'%Y-%m-%d %H:%i:%s') time,json->'$.e15[0]' as e15
+ FROM history_hourly
+ where time <![CDATA[>=]]>#{date}
+ and time <![CDATA[<]]>#{nextDate}
+ and mac=#{mac}
+ ORDER BY `time`
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0