From ed2a9d376c3846bb8d6cf838bfff9bd3ae07bc3b Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Mon, 12 Aug 2019 15:52:05 +0800
Subject: [PATCH] 修改多点重合下拉时第一个时间位置不变问题

---
 src/main/resources/mapper/HistoryMapper.xml |  122 ++++++++++++++++++++++++++++++++--------
 1 files changed, 97 insertions(+), 25 deletions(-)

diff --git a/src/main/resources/mapper/HistoryMapper.xml b/src/main/resources/mapper/HistoryMapper.xml
index 2408a33..0747947 100644
--- a/src/main/resources/mapper/HistoryMapper.xml
+++ b/src/main/resources/mapper/HistoryMapper.xml
@@ -6,39 +6,50 @@
 		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">
 		SELECT
-			AVG( h.`value` -> '$.${sensorKey}[0]' ) avg ,
+			AVG( h.${column} -> '$.${sensorKey}[0]' ) avg ,
 			<if test="dimension == 'profession'">
 				p.`name`
 			</if>
@@ -46,14 +57,17 @@
 				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,
-			history h,
+			${table} h,
 			monitor_point mp
 		WHERE
 			d.mac = h.mac 
@@ -61,9 +75,12 @@
 			AND mp.is_delete = '0'
 			AND d.monitor_point_id = mp.id 
 			AND h.time >= #{start}
-			AND mp.${regionType} = #{regionCode}
+			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,13 +105,68 @@
 		</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}
 		WHERE
-			${regionType} = #{regionCode}
+			${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>
+	
+	<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>
+	
+	<select id="getAVGValueByMacAndTimeslot" resultType="java.util.Map">
+		SELECT AVG(JSON_EXTRACT(value,'$.e1[0]')) e1,AVG(JSON_EXTRACT(value,'$.e2[0]')) e2,AVG(JSON_EXTRACT(value,'$.e10[0]')) e10,AVG(JSON_EXTRACT(value,'$.e11[0]')) e11,AVG(JSON_EXTRACT(value,'$.e16[0]')) e16,AVG(JSON_EXTRACT(value,'$.e15[0]')) e15
+		FROM history
+		WHERE mac = #{mac}
+		AND time BETWEEN #{starttime} AND #{endtime}
 	</select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0