Merge remote-tracking branch 'origin/master'

aijinhui

2023-12-14 0306d5836a7a56614e01af35b9e70f0224b47cb2

 ard-work/src/main/java/com/ruoyi/alarm/global/domain/GuidePriorityQueue.java

@@ -24,9 +24,8 @@
     */
    public static Comparator<GuideTask> getComparator() {
        Comparator<GuideTask> PriorityDescCom = Comparator.comparingInt(GuideTask::getPriority).reversed();
        Comparator<GuideTask> NumDescCom = Comparator.comparingInt(GuideTask::getNum).reversed();
        Comparator<GuideTask> receiveTimeAscCom = Comparator.comparing(GuideTask::getReceiveTime);
        Comparator<GuideTask> Comparator = PriorityDescCom.thenComparing(NumDescCom).thenComparing(receiveTimeAscCom);
        Comparator<GuideTask> Comparator = PriorityDescCom.thenComparing(receiveTimeAscCom);
        return Comparator;
    }

@@ -39,9 +38,8 @@
            PriorityBlockingQueue<GuideTask> queue = new PriorityBlockingQueue<>(priorityQueue);
            while (queue.size() > 0) {
                GuideTask task = queue.poll();
                log.info("正在排队【cameraId】" + task.getCameraId()+"【alarmId】" + task.getAlarmId() + "【receiveTime】" + task.getReceiveTime()
                        + "【alarmType】" + task.getAlarmType() + "【priority】" + task.getPriority() + "【num】" + task.getNum()
                        + "【chan】" + task.getChanNum() + "【recordSn】" + task.getRecordSn());
                log.info("正在排队【cameraId】" + task.getCameraId() + "【alarmId】" + task.getAlarmId() + "【receiveTime】" + task.getReceiveTime()
                        + "【alarmType】" + task.getAlarmType() + "【priority】" + task.getPriority() + "【chanNo】" + task.getChanNo());
            }
        }
    }