From 33ca0da19b3f87751662de0072c48ce9ce963202 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Wed, 31 Jul 2019 15:33:49 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
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