From 64f4079a20eb4499845182a5b91abbbbcf1b44fc Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期日, 27 四月 2025 15:17:24 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/cache/MessageQueue.java | 35 +++++++++++++++++++++++++++++++++--
1 files changed, 33 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 5f27eba..7c63158 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浜ゆ崲鏈�
@@ -25,6 +26,8 @@
private static final Map<Integer, LinkedBlockingQueue<Task>> LED_EXCHANGE = new ConcurrentHashMap<>();
// 纾呯Оmq浜ゆ崲鏈�
private static final Map<Integer, ConcurrentLinkedQueue<Task>> SCALE_EXCHANGE = new ConcurrentHashMap<>();
+ // 鍙拌溅mq浜ゆ崲鏈�
+ private static final Map<Integer, ConcurrentLinkedQueue<Task>> CAR_EXCHANGE = new ConcurrentHashMap<>();
/**
* mq 浜ゆ崲鏈哄垵濮嬪寲
@@ -32,7 +35,7 @@
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 Devp:
DEVP_EXCHANGE.put(slave.getId(), new ConcurrentLinkedQueue<>());
@@ -45,6 +48,9 @@
break;
case Scale:
SCALE_EXCHANGE.put(slave.getId(), new ConcurrentLinkedQueue<>());
+ break;
+ case Car:
+ CAR_EXCHANGE.put(slave.getId(), new ConcurrentLinkedQueue<>());
break;
default:
break;
@@ -67,6 +73,8 @@
return LED_EXCHANGE.get(id).offer(task);
case Scale:
return SCALE_EXCHANGE.get(id).offer(task);
+ case Car:
+ return CAR_EXCHANGE.get(id).offer(task);
default:
return false;
}
@@ -88,6 +96,8 @@
return LED_EXCHANGE.get(id).poll();
case Scale:
return SCALE_EXCHANGE.get(id).poll();
+ case Car:
+ return CAR_EXCHANGE.get(id).poll();
default:
return null;
}
@@ -108,6 +118,8 @@
return LED_EXCHANGE.get(id).peek();
case Scale:
return SCALE_EXCHANGE.get(id).peek();
+ case Car:
+ return CAR_EXCHANGE.get(id).peek();
default:
return null;
}
@@ -116,6 +128,7 @@
public static void clear(SlaveType type, Integer id){
switch (type) {
case Crn:
+
CRN_EXCHANGE.get(id).clear();
break;
case Devp:
@@ -130,9 +143,27 @@
case Scale:
SCALE_EXCHANGE.get(id).clear();
break;
+ case Car:
+ CAR_EXCHANGE.get(id).clear();
+ break;
default:
break;
}
}
+ public static boolean offer(SlaveType type, Integer devpId, Task task, Runnable callback) {
+ boolean result = offer(type, devpId, task); // 鍏堟墽琛屽師鏈変换鍔￠�昏緫
+ if (result && callback != null) {
+ new Thread(() -> {
+ try {
+ Thread.sleep(200); // 妯℃嫙浠诲姟鎵ц鏃堕棿
+ callback.run();
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ }
+ }).start();
+ }
+ return result;
+ }
+
}
--
Gitblit v1.9.1