From 1d7e1b771160dd8b7f25765e402ce25cac676641 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 24 Nov 2020 15:58:33 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

---
 src/main/resources/mapper/HangzhouAqiMapper.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/HangzhouAqiMapper.xml b/src/main/resources/mapper/HangzhouAqiMapper.xml
index b2299e7..f8c7053 100644
--- a/src/main/resources/mapper/HangzhouAqiMapper.xml
+++ b/src/main/resources/mapper/HangzhouAqiMapper.xml
@@ -71,7 +71,7 @@
     <select id="getAqiDataByAreaCode" resultType="java.util.Map">
         SELECT
         DATE_FORMAT(time, #{typeFormat}) time,
-        ifnull(aqi_json->'$.O3C',aqi_json->'$.O3') as 'O3'
+        ifnull(aqi_json->'$.${sensor1}',aqi_json->'$.${sensor2}') as '${sensor2}'
         FROM
         hangzhou_aqi
         WHERE
@@ -85,7 +85,7 @@
     <select id="getHistoryO3" resultType="java.util.Map">
         SELECT
         DATE_FORMAT(time, #{typeFormat}) time,
-        value->'$.O3' as 'O3'
+        value->'$.${sensor2}' as '${sensor2}'
         FROM
         history_aqi_${timeUnits}
         WHERE

--
Gitblit v1.8.0