From 22e1e78d68374ef02c588198d16001a0c01da879 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 31 Jul 2018 13:40:58 +0800
Subject: [PATCH] 冗余和不标准代码修复

---
 src/main/resources/mapper/HistoryMapper.xml |  167 ++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 104 insertions(+), 63 deletions(-)

diff --git a/src/main/resources/mapper/HistoryMapper.xml b/src/main/resources/mapper/HistoryMapper.xml
index b5027bc..bef36f5 100644
--- a/src/main/resources/mapper/HistoryMapper.xml
+++ b/src/main/resources/mapper/HistoryMapper.xml
@@ -1,90 +1,131 @@
 <?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.HistoryMapper">
-
-  <select id="getDayAQIByDevice" resultType="map">
-		SELECT
-			AVG(value -> '$.e1') e1,
-			AVG(value -> '$.e2') e2,
-			AVG(value -> '$.e10') e10,
-			AVG(value -> '$.e11') e11,
-			AVG(value -> '$.e15') e15,
-			AVG(value -> '$.e16') e16
-		FROM
-			history
-		WHERE
-			mac = #{mac}
-		AND time &gt; #{start}
-		AND time &lt; #{end}
-  </select>
-
-	<select id="getAllSensorAverageByDevice" resultType="java.util.LinkedHashMap">
-		SELECT
-			${queryColumns}
-		FROM
-			history h,
-			device d,
-			monitor_point mp
-		<if test="orgIds != null and orgIds.size &gt; 0">
-			LEFT JOIN monitor_point_organization mpo ON mpo.monitor_point_id = mp.id 
-			AND mpo.organization_id IN
-			<foreach close=")" collection="orgIds" item="listItem" open="(" separator=",">
-				#{listItem}
-			</foreach>
-		</if>
-		WHERE
-			mp.area_code = #{areaCode} 
-			AND h.time > #{start} 
-			AND h.time &lt; #{end}
-			AND h.mac = d.mac 
-			AND d.monitor_point_id = mp.id 
+<mapper namespace="com.moral.mapper.HistoryMapper">
+	<select id="selectValueByMacAndTime" resultType="java.lang.String">
+		select `value` from history
+		where  time = #{time} and mac = #{mac}
+		limit 0,1
 	</select>
-	
 	<select id="getAreaAllDataByAccount" resultType="java.util.LinkedHashMap">
 		SELECT
-		<if test="macKey == 'all'">
-			${queryColumns}
-		</if>	
-		<if test="macKey != 'all'">
-			d.`name`,
-			AVG( h.`value` -> ${macKey}) avg
-		</if>	
+			<if test="macKey != null">
+				d.`name`,
+			</if>	
+			<foreach  collection="sensorKeys" separator="," item="sensorKey">
+				AVG(h.`value` ->'$.${sensorKey}[0]') AS '${sensorKey}'
+			</foreach>
 		FROM
 			history h,
 			device d,
 			monitor_point mp
 		WHERE
 			mp.area_code = #{areaCode} 
-			AND h.time > #{start} 
+			AND h.time >= #{start} 
 			AND h.time &lt; #{end}
+			AND h.mac = d.mac 
+			AND d.monitor_point_id = mp.id 
 		<if test="orgIds != null and orgIds.size &gt; 0">
 			AND mp.organization_id IN
-			<foreach close=")" collection="orgIds" item="listItem" open="(" separator=",">
+			<foreach  collection="orgIds" open="(" separator="," close=")" item="listItem">
 				#{listItem}
 			</foreach>
 		</if>
-			AND h.mac = d.mac 
-			AND d.monitor_point_id = mp.id 
-		<if test="macKey != 'all'">
+		<if test="macKey != null">
 			GROUP BY d.id
-			ORDER BY avg desc
+			ORDER BY ${macKey} desc
 		</if>	
 	</select>
-	
-	<select id="getSensorsAverageByDevice4Report" resultType="map">
+
+	<select id="getRegionRankingData" resultType="java.util.Map">
 		SELECT
-			DATE_FORMAT(time, #{type}) time,
-			${queryColumns}
+			AVG( h.${column} -> '$.${sensorKey}[0]' ) avg ,
+			<if test="dimension == 'profession'">
+				p.`name`
+			</if>
+			<if test="dimension == 'monitorPoint'">
+				mp.`name`
+			</if>
+			<if test="dimension == 'region'">
+				r.${nextLevel}_name AS 'name'
+			</if>
 		FROM
-			history h
+			<if test="dimension == 'profession'">
+				profession p , 
+			</if>
+			<if test="dimension == 'region'">
+				${nextLevel} r,
+			</if>
+			device d,
+			${table} h,
+			monitor_point mp
 		WHERE
-			h.mac = #{mac}
-		AND h.time >= #{start}
-		AND h.time &lt; #{end}
+			d.mac = h.mac 
+			AND d.is_delete = '0'
+			AND mp.is_delete = '0'
+			AND d.monitor_point_id = mp.id 
+			AND h.time >= #{start}
+			AND mp.${regionType}_code = #{regionCode}
+			<if test="dimension == 'profession'">
+				AND d.profession_id = p.id 
+			</if>
+			<if test="dimension == 'region'">
+				AND r.${nextLevel}_code = mp.${nextLevel}_code
+			</if>
+			<if test="orgIds != null and orgIds.size &gt; 0">
+				AND mp.organization_id IN
+				<foreach  collection="orgIds" open="(" separator="," close=")" item="listItem">
+					#{listItem}
+				</foreach>
+			</if>
 		GROUP BY
-			DATE_FORMAT(time, #{type})
+			<if test="dimension == 'profession'">
+				p.id
+			</if>
+			<if test="dimension == 'monitorPoint'">
+				mp.id
+			</if>
+			<if test="dimension == 'region'">
+				mp.${nextLevel}_code
+			</if>
 		ORDER BY
-			time
+			avg DESC
+		<if test="dimension == 'monitorPoint'">
+		LIMIT 0,50
+		</if>
 	</select>
-	
+	
+	<select id="selectNextLevelRegion" resultType="string">
+		SELECT
+			${nextLevel}_name AS 'name' 
+		FROM
+			${nextLevel}
+		WHERE
+			${regionType}_code = #{regionCode}
+	</select>
+
+	<select id="getDischargeByRegion" resultType="java.util.Map">
+		SELECT
+			mp.`name`,
+			dis.`value` -> '$.${sensorKey}' 'value'
+		FROM
+			monitor_point mp,
+			discharge dis 
+		WHERE
+			dis.monitor_point_id = mp.id 
+			AND mp.${regionType}_code = #{regionCode}
+			AND dis.`year` = #{year}
+	</select>
+	
+	<select id="getValueByMacAndSize" resultType="java.util.Map">
+		SELECT 
+			value,
+			time
+		FROM
+			history 
+		WHERE
+			mac = #{mac} 
+		ORDER BY
+			time DESC 
+		LIMIT #{size}
+	</select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0