From 9009798abd7abfd726bcda80267c7d53dd3b8da3 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Wed, 12 Jun 2019 14:33:25 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

---
 src/main/resources/mapper/HistoryMapper.xml |   96 +++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 74 insertions(+), 22 deletions(-)

diff --git a/src/main/resources/mapper/HistoryMapper.xml b/src/main/resources/mapper/HistoryMapper.xml
index 3c0576f..8cc81ab 100644
--- a/src/main/resources/mapper/HistoryMapper.xml
+++ b/src/main/resources/mapper/HistoryMapper.xml
@@ -6,34 +6,45 @@
 		where  time = #{time} and mac = #{mac}
 		limit 0,1
 	</select>
+
 	<select id="getAreaAllDataByAccount" resultType="java.util.LinkedHashMap">
 		SELECT
-			<if test="macKey != null">
-				d.`name`,
-			</if>	
-			<foreach  collection="sensorKeys" separator="," item="sensorKey">
-				AVG(h.`value` ->'$.${sensorKey}[0]') AS '${sensorKey}'
-			</foreach>
+		<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 &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  collection="orgIds" open="(" separator="," close=")" item="listItem">
-				#{listItem}
-			</foreach>
-		</if>
+			h.mac = d.mac
+			AND d.monitor_point_id = mp.id
+			<if test="areaCode != null">
+				AND mp.area_code = #{areaCode}
+			</if>
+			<if test="start != null">
+				AND h.time >= #{start}
+			</if>
+			<if test="end != null">
+				AND h.time &lt; #{end}
+			</if>
+			<if test="monitorPointId != null">
+				AND mp.id = #{monitorPointId}
+			</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>
 		<if test="macKey != null">
 			GROUP BY d.id
 			ORDER BY ${macKey} desc
-		</if>	
+		</if>
 	</select>
 
 	<select id="getRegionRankingData" resultType="java.util.Map">
@@ -46,11 +57,14 @@
 				mp.`name`
 			</if>
 			<if test="dimension == 'region'">
-				mp.${nextLevel}_code AS 'code'
+				r.${nextLevel}_name AS 'name'
 			</if>
 		FROM
 			<if test="dimension == 'profession'">
 				profession p , 
+			</if>
+			<if test="dimension == 'region'">
+				${nextLevel} r,
 			</if>
 			device d,
 			${table} h,
@@ -64,6 +78,9 @@
 			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
@@ -88,9 +105,8 @@
 		</if>
 	</select>
 	
-	<select id="selectNextLevelRegion" resultType="java.util.Map">
+	<select id="selectNextLevelRegion" resultType="string">
 		SELECT
-			${nextLevel}_code AS 'code',
 			${nextLevel}_name AS 'name' 
 		FROM
 			${nextLevel}
@@ -101,7 +117,7 @@
 	<select id="getDischargeByRegion" resultType="java.util.Map">
 		SELECT
 			mp.`name`,
-			dis.`value` -> '$.e1' 'value'
+			dis.`value` -> '$.${sensorKey}' 'value'
 		FROM
 			monitor_point mp,
 			discharge dis 
@@ -110,4 +126,40 @@
 			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>
+	
+	<select id="getActualDataByRegion" resultType="java.util.Map">
+		SELECT
+		<foreach collection="sensorKeys" separator="," item="sensorKey">
+			MAX( `value` ->> '$.${sensorKey}' ) * 1 AS '${sensorKey}' 
+		</foreach>
+		FROM
+			history h ,
+			device d,
+			monitor_point mp
+		<where>
+			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  collection="orgIds" open="(" separator="," close=")" item="listItem">
+				#{listItem}
+			</foreach>
+		</if>
+			AND h.time >= #{start}			
+			AND h.time &lt; #{end}	
+		</where>
+	</select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0