forked from ard/ruoyi-api
parent: af3b68 | patch | commitdiff
‘liusuyi’
2023-12-14 e8d53b7555595df35bd2fe03a5c5cf449c38859c
refs
author ‘liusuyi’ <1951119284@qq.com>
Thursday, December 14, 2023 13:30 +0800
committer ‘liusuyi’ <1951119284@qq.com>
Thursday, December 14, 2023 13:30 +0800
commite8d53b7555595df35bd2fe03a5c5cf449c38859c
tree 8e1dd11cb6a26a7a3e895da0e6e2220acb91020b tree | zip | gz
parent af3b68eeca07a30967754dc1a61b8def9efe188c view | diff 
增加PTZ引导优先；
井管理增加可见光和热红外ptz设置；
雷达报警引导只需要引导雷达塔上的光电，通道根据日夜切换自动选择；
引导优先按井配置的ptz进行引导，当未配置时按经纬度进行引导；
相机优先级队列排序取消报警次数num比对，仅由优先级和接收时间作为比较器条件；
2 files deleted
16 files modified
639 ■■■■■ changed files
ard-work/src/main/java/com/ruoyi/alarm/global/domain/GuideDataDto.java 2 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/alarm/global/domain/GuidePTZ.java 21 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/alarm/global/domain/GuidePriorityQueue.java 8 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/alarm/global/domain/GuideTask.java 10 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java 92 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/QueueHandler.java 46 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/QueueManager.java 114 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/QueueTaskExecutor.java 146 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadarFire.java 9 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadarMove.java 10 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadarPump.java 11 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/alarmpoints/well/domain/ArdAlarmpointsWell.java 22 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java 46 ●●●●● diff | view | raw | blame | history
ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarFireMapper.xml 13 ●●●●● diff | view | raw | blame | history
ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMoveMapper.xml 16 ●●●●● diff | view | raw | blame | history
ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarPumpMapper.xml 11 ●●●●● diff | view | raw | blame | history
ard-work/src/main/resources/mapper/alarmpoints/ArdAlarmpointsWellMapper.xml 60 ●●●●● diff | view | raw | blame | history
ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java 2 ●●●●● diff | view | raw | blame | history