From b5b9378fcc0013a8b95d654f3aa09905c224182c Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期一, 03 七月 2023 09:18:38 +0800
Subject: [PATCH] 增加雷达报警1003和1004查看报警 修改查看报警点数量只获取未读数量
---
ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/domain/GuidePriorityQueue.java | 48 +++++++-----------------------------------------
1 files changed, 7 insertions(+), 41 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/domain/GuidePriorityQueue.java b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/domain/GuidePriorityQueue.java
index f6036a4..210c939 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/domain/GuidePriorityQueue.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/domain/GuidePriorityQueue.java
@@ -16,7 +16,7 @@
* @Date: 2023骞�06鏈�29鏃�11:18
* @Version: 1.0
**/
-@Slf4j
+@Slf4j(topic = "guideQueue")
public class GuidePriorityQueue {
/**
* 鐩告満闃熷垪锛屾瘡涓浉鏈轰竴涓紭鍏堢骇闃熷垪
@@ -40,47 +40,13 @@
public static void printPriorityQueue() {
for (String cameraId : GuidePriorityQueue.cameraQueueMap.keySet()) {
PriorityBlockingQueue<GuideTask> priorityQueue = GuidePriorityQueue.cameraQueueMap.get(cameraId);
-// for (GuideTask task : priorityQueue) {
-//
-// log.info("銆恆larmId銆�" + task.getAlarmId() + "銆恟eceiveTime銆�" + task.getReceiveTime()
-// + "銆恜riority銆�" + task.getPriority() + "銆恘um銆�" + task.getNum()
-// + "銆恈han銆�" + task.getChanNum() + "銆恟ecordSn銆�" + task.getRecordSn() + "銆恈ameraId銆�" + task.getCameraId());
-// }
- while (priorityQueue.size() > 0) {
- GuideTask task = priorityQueue.poll();
- log.info("銆恆larmId銆�" + task.getAlarmId() + "銆恟eceiveTime銆�" + task.getReceiveTime()
- + "銆恜riority銆�" + task.getPriority() + "銆恘um銆�" + task.getNum()
- + "銆恈han銆�" + task.getChanNum() + "銆恟ecordSn銆�" + task.getRecordSn() + "銆恈ameraId銆�" + task.getCameraId());;
+ 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());
}
}
}
-
-
- public static void main(String[] args) {
- Comparator<obj> com1 = Comparator.comparingInt(obj::getNUM1).reversed();
- Comparator<obj> com2 = Comparator.comparingInt(obj::getNUM2).reversed();
- Comparator<obj> com3 = Comparator.comparingInt(obj::getNUM3).reversed();
- Comparator<obj> objComparator = com1.thenComparing(com2).thenComparing(com3);
- PriorityQueue<obj> priorityQueue = new PriorityQueue<>(objComparator);
- priorityQueue.add(new obj(1, 1, 65));
- priorityQueue.add(new obj(1, 4, 21));
- priorityQueue.add(new obj(1, 4, 33));
- priorityQueue.add(new obj(1, 4, 44));
- priorityQueue.add(new obj(1, 4, 51));
-
- while (priorityQueue.size() > 0) {
- obj task = priorityQueue.poll();
- log.info("銆恘um1銆�" + task.getNUM1() + "銆恘um2銆�" + task.getNUM2() + "銆恘um3銆�" + task.getNUM3());
- }
- log.info("=======================================================================");
- }
-
-}
-
-@Data
-@AllArgsConstructor
-class obj {
- Integer NUM1;
- Integer NUM2;
- Integer NUM3;
}
\ No newline at end of file
--
Gitblit v1.9.3