From c9a299fda3528837c9072b34bb5b270eefe333d1 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 06 Feb 2018 17:09:07 +0800
Subject: [PATCH] 地图相关

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

diff --git a/src/main/resources/mapper/DeviceMapper.xml b/src/main/resources/mapper/DeviceMapper.xml
index cb2cba0..27f05e1 100644
--- a/src/main/resources/mapper/DeviceMapper.xml
+++ b/src/main/resources/mapper/DeviceMapper.xml
@@ -98,15 +98,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 +113,73 @@
 		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="getDeviceMacByMonitorPointAndDeviceVersion" resultType="string">
+		SELECT
+		mac
+		FROM
+		device
+		WHERE
+		monitor_point_id = #{monitorPointId}
+		AND device_version_id = #{deviceVersionId}
+	</select>
+	<select id="selectByOrgIdAndDevName" resultMap="BaseResultMap">
+		SELECT * from device dev
+		left join monitor_point mpt on dev.monitor_point_id = mpt.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 * from device dev
+		left join monitor_point mpt on dev.monitor_point_id = mpt.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.* from device dev
+		left join monitor_point  mpt on dev.monitor_point_id = mpt.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_organization_id_select(#{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>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0