From e8d53b7555595df35bd2fe03a5c5cf449c38859c Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期四, 14 十二月 2023 13:30:49 +0800
Subject: [PATCH] 增加PTZ引导优先； 井管理增加可见光和热红外ptz设置； 雷达报警引导只需要引导雷达塔上的光电，通道根据日夜切换自动选择； 引导优先按井配置的ptz进行引导，当未配置时按经纬度进行引导； 相机优先级队列排序取消报警次数num比对，仅由优先级和接收时间作为比较器条件；
---
ard-work/src/main/resources/mapper/device/ArdEquipRadarMapper.xml | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 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..b5ba729 100644
--- a/ard-work/src/main/resources/mapper/device/ArdEquipRadarMapper.xml
+++ b/ard-work/src/main/resources/mapper/device/ArdEquipRadarMapper.xml
@@ -85,6 +85,8 @@
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,',')) ))
@@ -194,12 +196,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
+
+ <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} limit 1
</select>
+ <select id="selectArdRadarsByDeptId" parameterType="Long" resultMap="ArdEquipRadarResult">
+ select * from ard_equip_radar where dept_id = #{deptId}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3