From 995a527d6e7d2d0cb141f6853b2b7a2a67b8a1c2 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 20 Nov 2020 18:00:22 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_job

---
 src/main/resources/mapper/AQIMapper.xml |   37 ++++++++++++++++++++++++++++++++++++-
 1 files changed, 36 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/AQIMapper.xml b/src/main/resources/mapper/AQIMapper.xml
index 766dd54..cb01946 100644
--- a/src/main/resources/mapper/AQIMapper.xml
+++ b/src/main/resources/mapper/AQIMapper.xml
@@ -1,15 +1,50 @@
 <?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>
 
     <insert id="insertAQIData">
-        INSERT INTO hangzhou_aqi (time, aqi_json,city_code)  values(
+        INSERT INTO hangzhou_aqi (`time`, aqi_json,city_code)  values(
         #{time},
         #{data},
         #{code}
         )
     </insert>
+
+    <select id="getO3" resultType="java.util.Map">
+        select DATE_FORMAT(time, #{typeFormat}) time,
+        ifnull(aqi_json->'$.O3C',aqi_json->'$.O3') 'O3'
+        from hangzhou_aqi
+        where city_code=#{cityCode}
+        and DATE_FORMAT(time, #{typeFormat}) in
+        <foreach collection="times" open="(" separator="," close=")" item="time">
+            #{time}
+        </foreach>
+    </select>
+
+    <select id="getO3ByTime" resultType="java.lang.String" useCache="true">
+        select ifnull(aqi_json->'$.O3C',aqi_json->'$.O3') as 'O3'
+        from hangzhou_aqi
+        where city_code=#{cityCode}
+        and DATE_FORMAT(time, #{typeFormat})=#{time}
+    </select>
+
+    <select id="getAqiByHour" resultType="java.util.Map">
+        select DATE_FORMAT(time, '%Y-%m-%d %H:%i:%s') time,
+        value
+        from history_aqi_${timeUnits}
+        where city_code=#{cityCode}
+        and DATE_FORMAT(time, '%Y%H')=#{yearAndHour}
+    </select>
+
+    <select id="getO3FromHistory" resultType="java.lang.String" useCache="true">
+        select value ->'$.O3C' as 'O3'
+        from history_aqi_${timeUnits}
+        where city_code=#{cityCode}
+        and DATE_FORMAT(time, #{typeFormat})=#{time}
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0