From e34d88ad7d3d950da12f032e6932ba14f868db72 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Wed, 21 Aug 2019 10:22:50 +0800
Subject: [PATCH] 修改大屏无人机地图弹窗显示不全问题，设置可拖动
---
src/main/resources/mapper/SensorMapper.xml | 76 +++++++++++++++++++++++++++++++++++--
1 files changed, 71 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/SensorMapper.xml b/src/main/resources/mapper/SensorMapper.xml
index 84e8794..d55dab1 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,55 @@
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>
+
+ <select id="getSensorsByMac" resultMap="BaseResultMap">
+ SELECT
+ DISTINCT s.*
+ FROM
+ sensor s,
+ device_version_sensor dvs,
+ device d
+ WHERE
+ s.id = dvs.sensor_id
+ AND dvs.device_version_id = d.device_version_id
+ <if test="mac != null">
+ AND d.mac = #{mac}
+ </if>
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0