From dcf1385a88fdf517e2cc60b50ea2e0a30e5652ca Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 02 Dec 2020 15:06:26 +0800
Subject: [PATCH] 更改获取五分钟数据结构BUG

---
 src/main/resources/mapper/RealWeatherMapper.xml |   49 +++++++++++++++++++++++++++++++++++++------------
 1 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/src/main/resources/mapper/RealWeatherMapper.xml b/src/main/resources/mapper/RealWeatherMapper.xml
index ad86d99..4e9a2d3 100644
--- a/src/main/resources/mapper/RealWeatherMapper.xml
+++ b/src/main/resources/mapper/RealWeatherMapper.xml
@@ -2,19 +2,44 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.moral.mapper.RealWeatherMapper">
     <resultMap id="BaseResultMap" type="com.moral.entity.RealWeather">
-        <id column="monitor_point_id" property="monitorPointId" jdbcType="INTEGER"/>
+        <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 monitor_point_id = #{monitorPointId}
-    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>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0