From 3df4f24049c8b3e4c36fde16a67a436ce37f00ad Mon Sep 17 00:00:00 2001
From: JinPengYong <812110275@qq.com>
Date: Sun, 26 Apr 2020 16:18:30 +0800
Subject: [PATCH] Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.

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

diff --git a/src/main/resources/mapper/DemoMapper.xml b/src/main/resources/mapper/DemoMapper.xml
index 8dba101..5d37761 100644
--- a/src/main/resources/mapper/DemoMapper.xml
+++ b/src/main/resources/mapper/DemoMapper.xml
@@ -19,4 +19,18 @@
 			LIMIT #{size}
 		</if>
 	</select>
+	<select id="selectByTimeZones" resultType="map">
+		select * from hangzhou_aqi where time in (
+			SELECT max(time) from (
+			 select time,cast(aqi_json->"$.AQI" as SIGNED INTEGER) as aqi from hangzhou_aqi
+			) hz where EXISTS ( select *  from (
+						select max(cast(aqi_json->"$.AQI" as SIGNED INTEGER)) as max_aqi,
+						DATE_FORMAT(time,'%Y-%m-%d') as day_time
+						from hangzhou_aqi
+						where time >= #{startTime} and time <![CDATA[<=]]> #{endTime}
+						GROUP BY day_time
+					) as max_result where day_time = DATE_FORMAT(hz.time,'%Y-%m-%d') and  max_aqi = hz.aqi
+			) GROUP BY DATE_FORMAT(time,'%Y-%m-%d') ORDER BY time ASC
+		)
+	</select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0