From 8bb914874ef1ebcda2a9c606224bf3e3db2f46f8 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 23 Nov 2020 09:51:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/AQIMapper.xml | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/AQIMapper.xml b/src/main/resources/mapper/AQIMapper.xml
index 3771b2c..34beeb3 100644
--- a/src/main/resources/mapper/AQIMapper.xml
+++ b/src/main/resources/mapper/AQIMapper.xml
@@ -18,8 +18,31 @@
ifnull(aqi_json->'$.O3C',aqi_json->'$.O3') 'O3'
from hangzhou_aqi
where city_code=#{cityCode}
- and time >= #{startTime}
- AND time <![CDATA[<]]> #{endTime}
- and DATE_FORMAT(time, #{typeFormat}) like '%${time}'
+ and DATE_FORMAT(time, #{typeFormat}) in
+ <foreach collection="times" open="(" separator="," close=")" item="time">
+ #{time}
+ </foreach>
+ </select>
+
+ <select id="getAqiFromHangzhou" resultType="java.lang.String">
+ select ifnull(aqi_json->'$.${sensorKey}',aqi_json->'$.${sensorKey1}') as '${sensorKey}'
+ from hangzhou_aqi
+ where city_code=#{cityCode}
+ and DATE_FORMAT(time, #{typeFormat})=#{time}
+ </select>
+
+ <select id="getAqiByHour" resultType="java.util.Map">
+ select DATE_FORMAT(time, '%Y-%m-%d %H:%i:%s') time,
+ value
+ from history_aqi_${timeUnits}
+ where city_code=#{cityCode}
+ and DATE_FORMAT(time, '%Y%H')=#{yearAndHour}
+ </select>
+
+ <select id="getAqiFromHistory" resultType="java.lang.String">
+ select value ->'$.${sensorKey}' as '${sensorKey}'
+ from history_aqi_${timeUnits}
+ where city_code=#{cityCode}
+ and DATE_FORMAT(time, #{typeFormat})=#{time}
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0