From f0b5148973e9437f3651153e53f8f336c4c3c6ff Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Thu, 22 Oct 2020 11:19:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/RealWeatherMapper.xml | 52 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 33 insertions(+), 19 deletions(-)
diff --git a/src/main/resources/mapper/RealWeatherMapper.xml b/src/main/resources/mapper/RealWeatherMapper.xml
index 2882762..4e9a2d3 100644
--- a/src/main/resources/mapper/RealWeatherMapper.xml
+++ b/src/main/resources/mapper/RealWeatherMapper.xml
@@ -5,27 +5,41 @@
<id column="city_code" property="cityCode" jdbcType="INTEGER"/>
</resultMap>
<select id="getRealWeather" resultType="java.util.Map">
- select
- DATE_FORMAT(time, #{typeFormat}) time,
- json
- FROM
- real_weather
- WHERE
- time >= #{start}
- AND time <![CDATA[<]]> #{end}
- AND city_code = #{cityCode}
- ORDER BY
- time
+ select
+ DATE_FORMAT(time, #{typeFormat}) time,
+ json
+ FROM
+ real_weather
+ WHERE
+ time >= #{start}
+ AND time <![CDATA[<]]> #{end}
+ AND city_code = #{cityCode}
+ ORDER BY
+ time
+ </select>
+
+ <select id="getHistoryWeather" resultType="java.util.Map">
+ select
+ DATE_FORMAT(time, #{typeFormat}) time,
+ value
+ FROM
+ history_weather_${timeUnits}
+ WHERE
+ time >= #{start}
+ AND time <![CDATA[<]]> #{end}
+ AND city_code = #{cityCode}
+ ORDER BY
+ time
</select>
<select id="getPrecip6Hour" resultType="java.util.Map">
- select
- round(sum(json->'$.precip'),2) 'precip6'
- FROM
- real_weather
- WHERE
- time >= #{start}
- AND time <![CDATA[<]]> #{end}
- AND city_code = #{cityCode}
+ select
+ round(sum(json->'$.precip'),2) 'precip6'
+ FROM
+ real_weather
+ WHERE
+ time >= #{start}
+ AND time <![CDATA[<]]> #{end}
+ AND city_code = #{cityCode}
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0