From 543b91f79c55687337984d39beb757648e6e73c1 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Tue, 06 Aug 2019 13:55:36 +0800
Subject: [PATCH] 新增根据mac查询sensors的Mapper接口

---
 src/main/resources/mapper/SensorMapper.xml |   25 ++++++++++++++++++++++++-
 1 files changed, 24 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/SensorMapper.xml b/src/main/resources/mapper/SensorMapper.xml
index 5eddf7b..4dfc9d8 100644
--- a/src/main/resources/mapper/SensorMapper.xml
+++ b/src/main/resources/mapper/SensorMapper.xml
@@ -50,8 +50,9 @@
 		  (
 			  select dev.id from device_version dev
 	  		   <where>
+				   1 > 1
 				   <if test="versionNos!=null and versionNos.size() > 0">
-					dev.version in
+				   or dev.version in
 					  <foreach collection="versionNos" item="versionNo" open="(" close=")" separator=",">
 							 #{versionNo,jdbcType=INTEGER}
 					  </foreach>
@@ -121,4 +122,26 @@
 			  )
 			 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