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/tube/service/impl/ArdAlarmTubeServiceImpl.java | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ard-work/src/main/java/com/ruoyi/alarm/tube/service/impl/ArdAlarmTubeServiceImpl.java b/ard-work/src/main/java/com/ruoyi/alarm/tube/service/impl/ArdAlarmTubeServiceImpl.java index ac64509..c10c735 100644 --- a/ard-work/src/main/java/com/ruoyi/alarm/tube/service/impl/ArdAlarmTubeServiceImpl.java +++ b/ard-work/src/main/java/com/ruoyi/alarm/tube/service/impl/ArdAlarmTubeServiceImpl.java @@ -4,7 +4,9 @@ import com.ruoyi.alarm.tube.mapper.ArdAlarmTubeMapper; import com.ruoyi.alarm.tube.service.IArdAlarmTubeService; import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.uuid.IdUtils; import org.springframework.stereotype.Service; + import javax.annotation.Resource; import java.util.List; @@ -50,8 +52,9 @@ */ @Override public int insertArdAlarmTube(ArdAlarmTube ardAlarmTube) { - ardAlarmTube.setCreateTime(DateUtils.getNowDate()); - return ardAlarmTubeMapper.insertArdAlarmTube(ardAlarmTube); + ardAlarmTube.setTubeId(IdUtils.simpleUUID()); + ardAlarmTube.setCreateTime(DateUtils.getNowDate()); + return ardAlarmTubeMapper.insertArdAlarmTube(ardAlarmTube); } /** -- Gitblit v1.9.3