From b52c1e137107abbaee8cdea45964def25c952a7f Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Wed, 18 Apr 2018 09:01:55 +0800
Subject: [PATCH] 饼图 功能

---
 src/main/resources/mapper/DeviceMapper.xml |  124 ++++++++++++++++++++++++++++++++++++++---
 1 files changed, 115 insertions(+), 9 deletions(-)

diff --git a/src/main/resources/mapper/DeviceMapper.xml b/src/main/resources/mapper/DeviceMapper.xml
index cb2cba0..0ce62ba 100644
--- a/src/main/resources/mapper/DeviceMapper.xml
+++ b/src/main/resources/mapper/DeviceMapper.xml
@@ -21,6 +21,7 @@
 	  </association>
 	  <association property="deviceVersion" javaType="com.moral.entity.DeviceVersion">
 		  <result column="device_version_id" property="id" jdbcType="INTEGER" />
+		  <result column="device_version_value" property="version" jdbcType="INTEGER" />
 		  <result column="device_version_name" property="name" jdbcType="VARCHAR" />
 	  </association>
 	  <association property="monitorPoint" javaType="com.moral.entity.MonitorPoint">
@@ -98,15 +99,6 @@
 		</if>
 		GROUP BY d.state
 	</select>
-	<select id="selectByOrgIdAndDevName" resultMap="BaseResultMap">
-        SELECT * from device dev
-        left join monitor_point mpt on dev.monitor_point_id = mpt.id
-        where
-		mpt.organization_id =  #{orgId}
-        <if test="devName!=null and ''!=devName">
-        and dev.name like #{devName}
-		</if>
-	</select>
 	<select id="getSensorsByDevice" resultType="java.util.Map">
 		SELECT
 			s.`key`,
@@ -122,4 +114,118 @@
 		ORDER BY
 			s.id
 	</select>
+	<select id="getDeviceVersionIdByMonitorPoint" resultType="map">
+		SELECT
+			device_version_id deviceVersionId
+		FROM
+			device
+		WHERE
+			monitor_point_id = #{monitorPoint}
+		GROUP BY
+			device_version_id
+	</select>
+	<select id="getDeviceVersionIdByAreaCode" resultType="int">
+		SELECT DISTINCT
+			d.device_version_id 
+		FROM
+			monitor_point mp,
+			device d 
+		WHERE
+			mp.area_code = #{areaCode} 
+			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>
+	</select>
+	<select id="getDeviceMacByMonitorPointAndDeviceVersion" resultType="string">
+		SELECT
+			mac
+		FROM
+			device
+		WHERE
+			monitor_point_id = #{monitorPointId}
+			AND device_version_id = #{deviceVersionId}
+	</select>
+	<select id="selectByOrgIdAndDevName" resultMap="BaseResultMap">
+		SELECT dev.*,dve.version as device_version_value from device dev
+		left join monitor_point mpt on dev.monitor_point_id = mpt.id
+		left join device_version dve on dev.device_version_id = dve.id
+		<where>
+			<if test="@com.moral.common.bean.Constants@isNotSpecialOrgId(orgId)">
+				mpt.organization_id =  #{orgId}
+			</if>
+		<if test="devName!=null and ''!=devName">
+			and dev.name like CONCAT('%',#{devName},'%')
+		</if>
+		</where>
+	</select>
+	<select id="selectByOrgIdAndMpId" resultMap="BaseResultMap">
+		SELECT dev.*,dve.version as device_version_value from device dev
+		left join monitor_point mpt on dev.monitor_point_id = mpt.id
+		left join device_version dve on dev.device_version_id = dve.id
+		<where>
+			<if test="@com.moral.common.bean.Constants@isNotSpecialOrgId(orgId)">
+				mpt.organization_id =  #{orgId}
+			</if>
+			and dev.monitor_point_id = #{mpId}
+		</where>
+	</select>
+	<select id="selectByMap" parameterType="java.util.Map" resultMap="BaseResultMap">
+		SELECT dev.*,dve.version as device_version_value from device dev
+		left join monitor_point  mpt on dev.monitor_point_id = mpt.id
+        left join device_version dve on dev.device_version_id = dve.id
+		<where>
+			<if test="@com.moral.common.bean.Constants@isNotSpecialOrgId(orgId)">
+				mpt.organization_id = #{orgId,jdbcType=VARCHAR}
+			</if>
+			<![CDATA[
+			AND dev.longitude < #{mapBounds.Ge,jdbcType=NUMERIC}
+            AND dev.longitude > #{mapBounds.Le,jdbcType=NUMERIC}
+            AND dev.latitude  < #{mapBounds.Fe,jdbcType=NUMERIC}
+            AND dev.latitude  > #{mapBounds.Ke,jdbcType=NUMERIC}
+     		 ]]>
+		</where>
+	</select>
+	<resultMap id="BaseResultWithOrgIdsMap" type="com.moral.entity.Device" extends="BaseResultMap">
+		<collection property="organizationIds" column="id" select="selectOrganizationIds"></collection>
+	</resultMap>
+	<!-- resultMap������ -->
+	<select id="selectOrganizationIds" resultType="INTEGER">
+		call proc_organizationIds_GetByDeviceId(#{id,jdbcType=INTEGER});
+	</select>
+	<select id="selectWithOrgIdsByMac" parameterType="java.lang.String" resultMap="BaseResultWithOrgIdsMap">
+		select
+		id,device_version_id,mac,monitor_point_id
+		from device
+		where mac = #{mac,jdbcType=VARCHAR}
+	</select>
+
+	<select id="getDeviceCountByRegion" resultType="INTEGER">
+		SELECT
+			COUNT( * ) 
+		FROM
+			device d 
+		WHERE
+			d.is_delete = 0 
+			AND d.monitor_point_id IN (
+				SELECT
+					mp.id 
+				FROM
+					monitor_point mp 
+				WHERE
+					mp.is_delete = 0 
+					<if test="provinceCode != null">
+					AND mp.province_code = #{provinceCode}
+					</if>
+					<if test="cityCode != null">
+					AND mp.city_code = #{cityCode}
+					</if>
+					<if test="areaCode != null">
+					AND mp.area_code = #{areaCode}
+					</if>
+			)
+	</select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0