From 3c3250c96a13c796aa88f1366b6d278cb95739e5 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 06 Jul 2018 13:53:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/resources/mapper/HistoryMapper.xml |   87 +++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 86 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/HistoryMapper.xml b/src/main/resources/mapper/HistoryMapper.xml
index 620c6e0..e19db1a 100644
--- a/src/main/resources/mapper/HistoryMapper.xml
+++ b/src/main/resources/mapper/HistoryMapper.xml
@@ -1,6 +1,11 @@
 <?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">
+<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 != null">
@@ -30,4 +35,84 @@
 			ORDER BY ${macKey} desc
 		</if>	
 	</select>
+
+	<select id="getRegionRankingData" resultType="java.util.Map">
+		SELECT
+			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
+			<if test="dimension == 'profession'">
+				profession p , 
+			</if>
+			<if test="dimension == 'region'">
+				${nextLevel} r,
+			</if>
+			device d,
+			${table} h,
+			monitor_point mp
+		WHERE
+			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
+			<if test="dimension == 'profession'">
+				p.id
+			</if>
+			<if test="dimension == 'monitorPoint'">
+				mp.id
+			</if>
+			<if test="dimension == 'region'">
+				mp.${nextLevel}_code
+			</if>
+		ORDER BY
+			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>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0