From 93cecfaf0fae080ebd0212adea714726290d0d4a Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期四, 01 八月 2024 20:36:54 +0800
Subject: [PATCH] 电磁锁串口协议发送加入线程排队提交
---
ard-work/src/main/resources/mapper/device/ArdEquipRadarMapper.xml | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/ard-work/src/main/resources/mapper/device/ArdEquipRadarMapper.xml b/ard-work/src/main/resources/mapper/device/ArdEquipRadarMapper.xml
index 63a35d5..f7e7cb2 100644
--- a/ard-work/src/main/resources/mapper/device/ArdEquipRadarMapper.xml
+++ b/ard-work/src/main/resources/mapper/device/ArdEquipRadarMapper.xml
@@ -27,6 +27,7 @@
<result property="type" column="type"/>
<result property="ip" column="ip"/>
<result property="towerName" column="name"/>
+ <result property="state" column="state"/>
</resultMap>
<sql id="selectArdEquipRadarVo">
@@ -50,7 +51,8 @@
c.image_width,
c.image_height,
c.type,
- c.ip
+ c.ip,
+ c.state
from ard_equip_radar c
left join sys_dept d on d.dept_id = c.dept_id
left join sys_user u on u.user_id = c.user_id
@@ -78,13 +80,16 @@
c.image_height,
c.type,
c.ip,
- t.name
+ t.name,
+ c.state
from ard_equip_radar c
left join sys_dept d on d.dept_id = c.dept_id
left join sys_user u on u.user_id = c.user_id
left join ard_towers t on t.id = c.tower_id
<where>
<if test="towerId != null and towerId != ''">and c.tower_id = #{towerId}</if>
+ <if test="ip != null and ip != ''">and c.ip = #{ip}</if>
+ <if test="type != null and type != ''">and c.type = #{type}</if>
<if test="userId != null and userId != ''">and c.user_id = #{userId}</if>
<if test="deptId != null ">and (c.dept_id = #{deptId} OR c.dept_id IN ( SELECT t.dept_id FROM sys_dept t
WHERE cast(#{deptId} as varchar) = any(string_to_array(ancestors,',')) ))
@@ -129,6 +134,7 @@
<if test="imageHeight != null">image_height,</if>
<if test="type != null">type,</if>
<if test="ip != null">ip,</if>
+ <if test="state != null">state,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
@@ -152,6 +158,7 @@
<if test="imageHeight != null">#{imageHeight},</if>
<if test="type != null">#{type},</if>
<if test="ip != null">#{ip},</if>
+ <if test="state != null">#{state},</if>
</trim>
</insert>
@@ -178,6 +185,7 @@
<if test="imageHeight != null">image_height = #{imageHeight},</if>
<if test="type != null">type = #{type},</if>
<if test="ip != null">ip = #{ip},</if>
+ <if test="state != null">state = #{state},</if>
</trim>
where id = #{id}
</update>
@@ -194,12 +202,14 @@
#{id}
</foreach>
</delete>
- <select id="getCameraByRadar" resultType="String">
- select ac.id
- from ard_equip_radar aer
- INNER JOIN ard_towers at
- on aer.tower_id= at.id
- INNER JOIN ard_cameras ac on aer.tower_id=ac.tower_id
- where aer.id=#{radarId} limit 1
+
+ <select id="getCameraByRadar" resultType="ArdCameras">
+ select ac.* from ard_equip_radar aer
+ INNER JOIN ard_towers at on aer.tower_id= at.id
+ INNER JOIN ard_cameras ac on aer.tower_id=ac.tower_id
+ where aer.id=#{radarId} and gdtype='1' limit 1
</select>
-</mapper>
\ No newline at end of file
+ <select id="selectArdRadarsByDeptId" parameterType="Long" resultMap="ArdEquipRadarResult">
+ select * from ard_equip_radar where dept_id = #{deptId}
+ </select>
+</mapper>
--
Gitblit v1.9.3