From 0306d5836a7a56614e01af35b9e70f0224b47cb2 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期四, 14 十二月 2023 13:51:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/alarm/global/domain/GuidePriorityQueue.java | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/global/domain/GuidePriorityQueue.java b/ard-work/src/main/java/com/ruoyi/alarm/global/domain/GuidePriorityQueue.java
index 03e4907..f0a8062 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/global/domain/GuidePriorityQueue.java
+++ b/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("姝ｅ湪鎺掗槦銆恈ameraId銆�" + task.getCameraId()+"銆恆larmId銆�" + task.getAlarmId() + "銆恟eceiveTime銆�" + task.getReceiveTime()
- + "銆恆larmType銆�" + task.getAlarmType() + "銆恜riority銆�" + task.getPriority() + "銆恘um銆�" + task.getNum()
- + "銆恈han銆�" + task.getChanNum() + "銆恟ecordSn銆�" + task.getRecordSn());
+ log.info("姝ｅ湪鎺掗槦銆恈ameraId銆�" + task.getCameraId() + "銆恆larmId銆�" + task.getAlarmId() + "銆恟eceiveTime銆�" + task.getReceiveTime()
+ + "銆恆larmType銆�" + task.getAlarmType() + "銆恜riority銆�" + task.getPriority() + "銆恈hanNo銆�" + task.getChanNo());
}
}
}
--
Gitblit v1.9.3