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/java/com/ruoyi/device/radar/domain/ArdEquipRadar.java | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ard-work/src/main/java/com/ruoyi/device/radar/domain/ArdEquipRadar.java b/ard-work/src/main/java/com/ruoyi/device/radar/domain/ArdEquipRadar.java index f823752..997f410 100644 --- a/ard-work/src/main/java/com/ruoyi/device/radar/domain/ArdEquipRadar.java +++ b/ard-work/src/main/java/com/ruoyi/device/radar/domain/ArdEquipRadar.java @@ -2,6 +2,7 @@ import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -84,6 +85,7 @@ */ @Excel(name = "濉攊d") private String towerId; + @TableField(exist = false) private String towerName; /** -- Gitblit v1.9.3