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/alarm/radar/domain/ArdAlarmRadarPump.java | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadarPump.java b/ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadarPump.java index 82af9b6..07a03c0 100644 --- a/ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadarPump.java +++ b/ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadarPump.java @@ -62,15 +62,10 @@ @Excel(name = "绾害") private Double latitude; /** - * 寮曞褰曞儚1 + * 寮曞褰曞儚 */ - @Excel(name = "寮曞褰曞儚1") - private String recordUrl1; - /** - * 寮曞褰曞儚2 - */ - @Excel(name = "寮曞褰曞儚2") - private String recordUrl2; + @Excel(name = "寮曞褰曞儚") + private String recordUrl; /** * 鏌ョ湅鏃堕棿 -- Gitblit v1.9.3