From 30d1267479ad9cb076cb2692befc6fe3a53fa7d9 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 25 Jul 2019 16:04:19 +0800
Subject: [PATCH] 删选监控站点和设备的因子

---
 src/main/resources/mapper/SensorMapper.xml |   61 ++++++++++++++++++++++++++++--
 1 files changed, 56 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/mapper/SensorMapper.xml b/src/main/resources/mapper/SensorMapper.xml
index 84e8794..4dfc9d8 100644
--- a/src/main/resources/mapper/SensorMapper.xml
+++ b/src/main/resources/mapper/SensorMapper.xml
@@ -34,7 +34,30 @@
 	   and dvs.device_version_id in
 		  (
 			  select dev.id from device_version dev
-	  		  where dev.version = #{versionNo,jdbcType=INTEGER}
+	  		  where dev.version = #{deviceVersionNo,jdbcType=INTEGER}
+		  )
+    )
+  </select>
+  <select id="selectByVersionNos" resultMap="BaseResultMap" parameterType="java.util.List" >
+    select
+    <include refid="Base_Column_List" />
+    from sensor sen
+    where EXISTS
+    (  select id
+       from device_version_sensor dvs
+       where sen.id = dvs.sensor_id
+	   and dvs.device_version_id in
+		  (
+			  select dev.id from device_version dev
+	  		   <where>
+				   1 > 1
+				   <if test="versionNos!=null and versionNos.size() > 0">
+				   or dev.version in
+					  <foreach collection="versionNos" item="versionNo" open="(" close=")" separator=",">
+							 #{versionNo,jdbcType=INTEGER}
+					  </foreach>
+				   </if>
+			  </where>
 		  )
     )
   </select>
@@ -85,12 +108,40 @@
 		  select * from sensor sen where sen.id in
 			(
 			   select DISTINCT sensor_id from device_version_sensor dvs
-				 where dvs.device_version_id in (
+				 where dvs.device_version_id
+				 in (
 						select DISTINCT device_version_id from device dev where
 						EXISTS (select * from monitor_point mpt where
 						 mpt.organization_id = #{organizationId,jdbcType=INTEGER} and mpt.id = dev.monitor_point_id
-						)
-				 )
-			) order by sen.id asc
+						 OR EXISTS  (
+						              SELECT * from dictionary_data
+									  where dict_data_key = 'auth_config_super_org' and dict_data_value = #{organizationId,jdbcType=INTEGER}
+									  )
+							    )
+				  )
+			  )
+			 order by sen.id asc
+	</select>
+	
+	<select id="getSensorBySensorKey" resultType="java.util.Map">
+		SELECT *
+		FROM sensor
+		WHERE sensor_key = #{sensor_key}
+	</select>
+	
+	<select id="getSensorByDeviceId" resultType="java.util.Map">
+		SELECT DISTINCT d.id,d.monitor_point_id,s.*
+		FROM device d,device_version dv,device_version_sensor dvs,sensor s
+		WHERE d.device_version_id = dvs.device_version_id
+		AND dvs.sensor_id = s.id
+		AND d.id = #{id}
+	</select>
+	
+	<select id="getSensorByMonitorPointId" resultType="java.util.Map">
+		SELECT DISTINCT s.*
+		FROM device d,device_version dv,device_version_sensor dvs,sensor s
+		WHERE d.device_version_id = dvs.device_version_id
+		AND dvs.sensor_id = s.id
+		AND d.monitor_point_id = #{monitor_point_id}
 	</select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0