From b4aa377b5e7898cd2ef018cc385a19af67a56839 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Mon, 26 Mar 2018 14:05:58 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2.git

---
 src/main/resources/mapper/DeviceMapper.xml |   44 ++++++++++++++++++++++++++++++++------------
 1 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/src/main/resources/mapper/DeviceMapper.xml b/src/main/resources/mapper/DeviceMapper.xml
index 27f05e1..846ad57 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">
@@ -115,26 +116,43 @@
 	</select>
 	<select id="getDeviceVersionIdByMonitorPoint" resultType="map">
 		SELECT
-		device_version_id deviceVersionId
+			device_version_id deviceVersionId
 		FROM
-		device
+			device
 		WHERE
-		monitor_point_id = #{monitorPoint}
+			monitor_point_id = #{monitorPoint}
 		GROUP BY
-		device_version_id
+			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
+			mac
 		FROM
-		device
+			device
 		WHERE
-		monitor_point_id = #{monitorPointId}
-		AND device_version_id = #{deviceVersionId}
+			monitor_point_id = #{monitorPointId}
+			AND device_version_id = #{deviceVersionId}
 	</select>
 	<select id="selectByOrgIdAndDevName" resultMap="BaseResultMap">
-		SELECT * from device dev
+		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}
@@ -145,8 +163,9 @@
 		</where>
 	</select>
 	<select id="selectByOrgIdAndMpId" resultMap="BaseResultMap">
-		SELECT * from device dev
+		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}
@@ -155,8 +174,9 @@
 		</where>
 	</select>
 	<select id="selectByMap" parameterType="java.util.Map" resultMap="BaseResultMap">
-		SELECT dev.* from device dev
+		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}
@@ -174,7 +194,7 @@
 	</resultMap>
 	<!-- resultMap������ -->
 	<select id="selectOrganizationIds" resultType="INTEGER">
-		call proc_organization_id_select(#{id,jdbcType=INTEGER});
+		call proc_organizationIds_GetByDeviceId(#{id,jdbcType=INTEGER});
 	</select>
 	<select id="selectWithOrgIdsByMac" parameterType="java.lang.String" resultMap="BaseResultWithOrgIdsMap">
 		select

--
Gitblit v1.8.0