From c904f735e0b8a488ef56744c08f8e10258639bce Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期四, 05 六月 2025 15:54:58 +0800 Subject: [PATCH] # --- src/main/java/com/zy/core/cache/MessageQueue.java | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zy/core/cache/MessageQueue.java b/src/main/java/com/zy/core/cache/MessageQueue.java index 8bb9d7c..cdabb4b 100644 --- a/src/main/java/com/zy/core/cache/MessageQueue.java +++ b/src/main/java/com/zy/core/cache/MessageQueue.java @@ -1,5 +1,6 @@ package com.zy.core.cache; +import com.zy.asrs.utils.CommandUtils; import com.zy.core.Slave; import com.zy.core.enums.SlaveType; import com.zy.core.model.Task; @@ -16,7 +17,7 @@ public class MessageQueue { // 鍫嗗灈鏈簃q浜ゆ崲鏈� - private static final Map<Integer, ConcurrentLinkedQueue<Task>> CRN_EXCHANGE = new ConcurrentHashMap<>(); + private static final Map<Integer, LinkedBlockingQueue<Task>> CRN_EXCHANGE = new ConcurrentHashMap<>(); // 杈撻�佺嚎mq浜ゆ崲鏈� private static final Map<Integer, ConcurrentLinkedQueue<Task>> DEVP_EXCHANGE = new ConcurrentHashMap<>(); // 鏉$爜鎵弿浠猰q浜ゆ崲鏈� @@ -28,13 +29,17 @@ // 鍙拌溅mq浜ゆ崲鏈� private static final Map<Integer, ConcurrentLinkedQueue<Task>> CAR_EXCHANGE = new ConcurrentHashMap<>(); + private static final Map<Integer, LinkedBlockingQueue<Task>> RGV_EXCHANGE = new ConcurrentHashMap<>(); /** * mq 浜ゆ崲鏈哄垵濮嬪寲 */ public static void init(SlaveType type, Slave slave) { switch (type) { case Crn: - CRN_EXCHANGE.put(slave.getId(), new ConcurrentLinkedQueue<>()); + CRN_EXCHANGE.put(slave.getId(), new LinkedBlockingQueue<>(1)); + break; + case Rgv: + RGV_EXCHANGE.put(slave.getId(), new LinkedBlockingQueue<>(1)); break; case Devp: DEVP_EXCHANGE.put(slave.getId(), new ConcurrentLinkedQueue<>()); @@ -64,6 +69,8 @@ switch (type) { case Crn: return CRN_EXCHANGE.get(id).offer(task); + case Rgv: + return RGV_EXCHANGE.get(id).offer(task); case Devp: return DEVP_EXCHANGE.get(id).offer(task); case Barcode: @@ -87,6 +94,8 @@ switch (type) { case Crn: return CRN_EXCHANGE.get(id).poll(); + case Rgv: + return RGV_EXCHANGE.get(id).poll(); case Devp: return DEVP_EXCHANGE.get(id).poll(); case Barcode: @@ -109,6 +118,8 @@ switch (type) { case Crn: return CRN_EXCHANGE.get(id).peek(); + case Rgv: + return RGV_EXCHANGE.get(id).peek(); case Devp: return DEVP_EXCHANGE.get(id).peek(); case Barcode: @@ -129,6 +140,9 @@ case Crn: CRN_EXCHANGE.get(id).clear(); break; + case Rgv: + RGV_EXCHANGE.get(id).clear(); + break; case Devp: DEVP_EXCHANGE.get(id).clear(); break; -- Gitblit v1.9.1