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 | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/AQIMapper.xml b/src/main/resources/mapper/AQIMapper.xml
index ffddfca..34beeb3 100644
--- a/src/main/resources/mapper/AQIMapper.xml
+++ b/src/main/resources/mapper/AQIMapper.xml
@@ -24,8 +24,8 @@
</foreach>
</select>
- <select id="getO3ByTime" resultType="java.lang.String">
- select ifnull(aqi_json->'$.O3C',aqi_json->'$.O3') as 'O3'
+ <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}
@@ -39,8 +39,8 @@
and DATE_FORMAT(time, '%Y%H')=#{yearAndHour}
</select>
- <select id="getO3FromHistory" resultType="java.lang.String">
- select value ->'$.O3C' as 'O3'
+ <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}
--
Gitblit v1.8.0