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/alarmpoints/ArdAlarmpointsWellMapper.xml | 42 ++++++++++++++++++++++++++++++++++++------
1 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/ard-work/src/main/resources/mapper/alarmpoints/ArdAlarmpointsWellMapper.xml b/ard-work/src/main/resources/mapper/alarmpoints/ArdAlarmpointsWellMapper.xml
index 3e5dea9..e6247af 100644
--- a/ard-work/src/main/resources/mapper/alarmpoints/ArdAlarmpointsWellMapper.xml
+++ b/ard-work/src/main/resources/mapper/alarmpoints/ArdAlarmpointsWellMapper.xml
@@ -28,7 +28,12 @@
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
- <result property="cameraId" column="camera_id"/>
+ <result property="guideP1" column="guide_p1"/>
+ <result property="guideT1" column="guide_t1"/>
+ <result property="guideZ1" column="guide_z1"/>
+ <result property="guideP2" column="guide_p2"/>
+ <result property="guideT2" column="guide_t2"/>
+ <result property="guideZ2" column="guide_z2"/>
</resultMap>
<resultMap type="ArdAlarmpointsWell" id="wellResult">
@@ -61,7 +66,12 @@
c.create_time,
c.update_by,
c.update_time,
- c.camera_id
+ c.guide_p1,
+ c.guide_t1,
+ c.guide_z1,
+ c.guide_p2,
+ c.guide_t2,
+ c.guide_z2
from ard_alarmpoints_well 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
@@ -126,7 +136,12 @@
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
- <if test="cameraId != null">camera_id,</if>
+ <if test="guideP1 != null">guide_p1,</if>
+ <if test="guideT1 != null">guide_t1,</if>
+ <if test="guideZ1 != null">guide_z1,</if>
+ <if test="guideP2 != null">guide_p2,</if>
+ <if test="guideT2 != null">guide_t2,</if>
+ <if test="guideZ2 != null">guide_z2,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
@@ -152,7 +167,12 @@
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
- <if test="cameraId != null">#{cameraId},</if>
+ <if test="guideP1 != null">#{guideP1},</if>
+ <if test="guideT1 != null">#{guideT1},</if>
+ <if test="guideZ1 != null">#{guideZ1},</if>
+ <if test="guideP2 != null">#{guideP2},</if>
+ <if test="guideT2 != null">#{guideT2},</if>
+ <if test="guideZ2 != null">#{guideZ2},</if>
</trim>
</insert>
@@ -181,7 +201,12 @@
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
- <if test="cameraId != null">camera_id = #{cameraId},</if>
+ <if test="guideP1 != null">guide_p1 = #{guideP1},</if>
+ <if test="guideT1 != null">guide_t1 = #{guideT1},</if>
+ <if test="guideZ1 != null">guide_z1 = #{guideZ1},</if>
+ <if test="guideP2 != null">guide_p2 = #{guideP2},</if>
+ <if test="guideT2 != null">guide_t2 = #{guideT2},</if>
+ <if test="guideZ2 != null">guide_z2 = #{guideZ2},</if>
</trim>
where id = #{id}
</update>
@@ -210,7 +235,12 @@
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
- <if test="cameraId != null">camera_id = #{cameraId},</if>
+ <if test="guideP1 != null">guide_p1 = #{guideP1},</if>
+ <if test="guideT1 != null">guide_t1 = #{guideT1},</if>
+ <if test="guideZ1 != null">guide_z1 = #{guideZ1},</if>
+ <if test="guideP2 != null">guide_p2 = #{guideP2},</if>
+ <if test="guideT2 != null">guide_t2 = #{guideT2},</if>
+ <if test="guideZ2 != null">guide_z2 = #{guideZ2},</if>
</trim>
where well_id = #{wellId}
</update>
--
Gitblit v1.9.3