Merge remote-tracking branch 'origin/master'

aijinhui

2023-12-14 af3b68eeca07a30967754dc1a61b8def9efe188c

 ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java

@@ -110,7 +110,7 @@
    @Resource
    private RedisCache redisCache;
    @Resource
    private QueueManager queueManager;
    private QueueHandler queueHandler;
    @Resource
    private ArdEquipRadarMapper ardEquipRadarMapper;
    //endregion
@@ -1427,7 +1427,7 @@
                guideTask.setGuidePTZ(guideDataDto.getGuidePTZ());
            }
            //消息入队
            queueManager.addTaskToQueue(cameraId, guideTask);
            queueHandler.addTaskToQueue(cameraId, guideTask);
            //打印队列
            GuidePriorityQueue.printPriorityQueue();
        } catch (Exception ex) {