From cda3fcb63a6cebb154a3770c4c6c288cd660d762 Mon Sep 17 00:00:00 2001
From: JinPengYong <812110275@qq.com>
Date: Sun, 26 Apr 2020 16:34:12 +0800
Subject: [PATCH] 国控因子与监测因子平均值对比

---
 src/main/resources/mapper/HangzhouAqiMapper.xml |   54 +++++++++++++++++++++++++++++-------------------------
 1 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/src/main/resources/mapper/HangzhouAqiMapper.xml b/src/main/resources/mapper/HangzhouAqiMapper.xml
index bd3e260..81fe13b 100644
--- a/src/main/resources/mapper/HangzhouAqiMapper.xml
+++ b/src/main/resources/mapper/HangzhouAqiMapper.xml
@@ -1,21 +1,21 @@
 <?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.HangzhouAqiMapper" >
-  <resultMap id="BaseResultMap" type="com.moral.entity.HangzhouAqi" >
-    <id column="time" property="time" jdbcType="TIMESTAMP" />
-    <result column="aqi_json" property="aqiJson" jdbcType="OTHER" />
-    <result column="city_code" property="cityCode" jdbcType="VARCHAR" />
+<mapper namespace="com.moral.mapper.HangzhouAqiMapper">
+  <resultMap id="BaseResultMap" type="com.moral.entity.HangzhouAqi">
+    <id column="time" property="time" jdbcType="TIMESTAMP"/>
+    <result column="aqi_json" property="aqiJson" jdbcType="OTHER"/>
+    <result column="city_code" property="cityCode" jdbcType="VARCHAR"/>
   </resultMap>
-  <sql id="Base_Column_List" >
+  <sql id="Base_Column_List">
     time, aqi_json, city_code
   </sql>
   <!--<select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.util.Date" >-->
-    <!--select-->
-    <!--<include refid="Base_Column_List" />-->
-    <!--from hangzhou_aqi-->
-    <!--where time = #{time,jdbcType=TIMESTAMP}-->
+  <!--select-->
+  <!--<include refid="Base_Column_List" />-->
+  <!--from hangzhou_aqi-->
+  <!--where time = #{time,jdbcType=TIMESTAMP}-->
   <!--</select>-->
-    <select id="selectAqisByCodeAndTimePeriod" resultType="map" parameterType="java.util.Date" >
+  <select id="selectAqisByCodeAndTimePeriod" resultType="map" parameterType="java.util.Date">
       select
         aqi_json->'$.AQI' as aqi,DATE_FORMAT(time,'${@com.moral.common.util.ReportTimeFormat@toMySqlTimeFormat(timePeriod.timeUnits)}') as 'time'
       from hangzhou_aqi
@@ -33,18 +33,22 @@
           order by time asc
     </select>
 
-    <select id="getAqisByOrganizationId" resultType="map">
-		SELECT
-			h.aqi_json ->> '$.AQI' * 1 aqi,
-			DATE_FORMAT( h.time, '%H' ) * 1 time 
-		FROM
-			hangzhou_aqi h 
-		<where>
-			h.city_code = #{cityCode}
-		AND h.time <![CDATA[<]]> #{end}
-		</where> 
-		ORDER BY
-			h.time DESC
-		LIMIT 24
+  <select id="getAqisByOrganizationId" resultType="map">
+    SELECT
+    h.aqi_json ->> '$.AQI' * 1 aqi,
+    DATE_FORMAT( h.time, '%H' ) * 1 time
+    FROM
+    hangzhou_aqi h
+    <where>
+      h.city_code = #{cityCode}
+      AND h.time <![CDATA[<]]> #{end}
+    </where>
+    ORDER BY
+    h.time DESC
+    LIMIT 24
+  </select>
+
+  <select id="queryCityCode" resultType="integer">
+      select city_code from area where area_code = #{areaCode}
     </select>
-</mapper>
\ No newline at end of file
+</mapper>

--
Gitblit v1.8.0