From d3c68dd9fec28c76e0bb61879dffaa7b0ec1e690 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 23 Nov 2020 09:50:07 +0800
Subject: [PATCH] update

---
 src/main/resources/mapper/AQIMapper.xml |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/mapper/AQIMapper.xml b/src/main/resources/mapper/AQIMapper.xml
index cb01946..34beeb3 100644
--- a/src/main/resources/mapper/AQIMapper.xml
+++ b/src/main/resources/mapper/AQIMapper.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.moral.mapper.AQIMapper">
-    <cache/>
-
     <select id="getCityAqiConfig" resultType="java.util.LinkedHashMap">
         select * from city_aqi_config;
     </select>
@@ -26,8 +24,8 @@
         </foreach>
     </select>
 
-    <select id="getO3ByTime" resultType="java.lang.String" useCache="true">
-        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}
@@ -41,8 +39,8 @@
         and DATE_FORMAT(time, '%Y%H')=#{yearAndHour}
     </select>
 
-    <select id="getO3FromHistory" resultType="java.lang.String" useCache="true">
-        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