From 9009798abd7abfd726bcda80267c7d53dd3b8da3 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Wed, 12 Jun 2019 14:33:25 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/resources/mapper/SensorMapper.xml | 39 ++++++++++++++++++++++++++++++++++-----
1 files changed, 34 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/SensorMapper.xml b/src/main/resources/mapper/SensorMapper.xml
index 84e8794..054e376 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,18 @@
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>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0