From 70210b0eb0c58e1779fd89cbcf0909154d7d4936 Mon Sep 17 00:00:00 2001 From: ‘liusuyi’ <1951119284@qq.com> Date: 星期六, 01 七月 2023 11:45:18 +0800 Subject: [PATCH] 基本完成优先级排队报警逻辑 --- ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/QueueManager.java | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/QueueManager.java b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/QueueManager.java index c4cf0fe..edff059 100644 --- a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/QueueManager.java +++ b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/QueueManager.java @@ -24,7 +24,7 @@ */ @Component -@Slf4j +@Slf4j(topic = "guideQueue") public class QueueManager { @Autowired @@ -64,8 +64,9 @@ PriorityBlockingQueue<GuideTask> guideTaskQueue = GuidePriorityQueue.cameraQueueMap.get(cameraId); if(StringUtils.isNull(guideTaskQueue)) { - log.info("鐩告満鏈垵濮嬪寲鎴愬姛锛屾病鏈夐槦鍒�"); + log.info("鐩告満鏈櫥褰曪紝娌℃湁闃熷垪"); } + log.debug("鏂颁换鍔″叆闃�:"+task.getAlarmId()); guideTaskQueue.add(task); /*鑾峰彇璇ョ浉鏈虹殑褰撳墠鎵ц绾跨▼*/ TaskThread currentTaskThread = threadMap.get(cameraId); @@ -92,14 +93,15 @@ while (!Thread.currentThread().isInterrupted()) { try { GuideTask task = queue.take(); + log.debug("鍙栧嚭闃熷垪鏁版嵁:"+task.getAlarmId()); taskExecutor.processTask(task); - // GuidePriorityQueue.printPriorityQueue(); // 鏇存柊绾跨▼鐨勫綋鍓嶄换鍔� TaskThread currentTaskThread = threadMap.get(queueName); if (currentTaskThread != null) { currentTaskThread.setCurrentTask(task); } } catch (InterruptedException e) { + log.info("涓柇褰撳墠绾跨▼"); //绾跨▼涓柇锛岄��鍑哄惊鐜� Thread.currentThread().interrupt(); } -- Gitblit v1.9.3