From e745dd38c5a413eaa000c7c5434621fbcd1800d5 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Wed, 23 Dec 2020 13:55:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/ForecastWeatherMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/ForecastWeatherMapper.xml b/src/main/resources/mapper/ForecastWeatherMapper.xml
index e0e76d8..9ce0208 100644
--- a/src/main/resources/mapper/ForecastWeatherMapper.xml
+++ b/src/main/resources/mapper/ForecastWeatherMapper.xml
@@ -7,7 +7,7 @@
<select id="getForecastHour" resultType="java.util.Map">
SELECT
DATE_FORMAT(time, #{typeFormat}) time,
- json->'$.O3C' 'O3'
+ json->'$.${sensor1}' '${sensor2}'
from forecast_weather
where time >= #{start}
AND time <![CDATA[<]]> #{end}
@@ -45,7 +45,7 @@
<select id="getO38Hours" resultType="java.util.Map">
select
- AVG(json->'$.O3C') as 'O3C_8H'
+ cast(AVG(json->'$.O3C') as UNSIGNED integer) 'O3_8H'
FROM
forecast_weather
WHERE
--
Gitblit v1.8.0