From ad205a9ee0b1ff18eabed3528407f13a52193dcf Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期五, 11 四月 2025 13:41:53 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/cache/MessageQueue.java |  159 ++++++++++++++++++++--------------------------------
 1 files changed, 62 insertions(+), 97 deletions(-)

diff --git a/src/main/java/com/zy/core/cache/MessageQueue.java b/src/main/java/com/zy/core/cache/MessageQueue.java
index cad0ffb..d5c4d08 100644
--- a/src/main/java/com/zy/core/cache/MessageQueue.java
+++ b/src/main/java/com/zy/core/cache/MessageQueue.java
@@ -7,7 +7,6 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.LinkedBlockingQueue;
 
 /**
  * 娑堟伅闃熷垪
@@ -15,56 +14,41 @@
  */
 public class MessageQueue {
 
-    // 鍫嗗灈鏈簃q浜ゆ崲鏈�
-    private static final Map<Integer, LinkedBlockingQueue<Task>> CRN_EXCHANGE = new ConcurrentHashMap<>();
-    // 绌挎杞q浜ゆ崲鏈�
-    private static final Map<Integer, LinkedBlockingQueue<Task>> STE_EXCHANGE = new ConcurrentHashMap<>();
-    // 杈撻�佺嚎mq浜ゆ崲鏈�
-    private static final Map<Integer, ConcurrentLinkedQueue<Task>> DEVP_EXCHANGE = new ConcurrentHashMap<>();
-    // 鏉$爜鎵弿浠猰q浜ゆ崲鏈�
-    private static final Map<Integer, ConcurrentLinkedQueue<Task>> BARCODE_EXCHANGE = new ConcurrentHashMap<>();
-    // Led鐏� mq浜ゆ崲鏈�
-    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<>();
     //鍥涘悜绌挎杞q浜ゆ崲鏈�
     private static final Map<Integer, ConcurrentLinkedQueue<Task>> SHUTTLE_EXCHANGE = new ConcurrentHashMap<>();
+    //杈撻�乵q浜ゆ崲鏈�
+    private static final Map<Integer, ConcurrentLinkedQueue<Task>> DEVP_EXCHANGE = new ConcurrentHashMap<>();
     //鎻愬崌鏈簃q浜ゆ崲鏈�
     private static final Map<Integer, ConcurrentLinkedQueue<Task>> LIFT_EXCHANGE = new ConcurrentHashMap<>();
+    //璐у弶鎻愬崌鏈簃q浜ゆ崲鏈�
+    private static final Map<Integer, ConcurrentLinkedQueue<Task>> FORK_LIFT_EXCHANGE = new ConcurrentHashMap<>();
+    //璐у弶鎻愬崌鏈篗aster mq浜ゆ崲鏈�
+    private static final Map<Integer, ConcurrentLinkedQueue<Task>> FORK_LIFT_MASTER_EXCHANGE = new ConcurrentHashMap<>();
+    //鏄剧ず灞弇q浜ゆ崲鏈�
+    private static final Map<Integer, ConcurrentLinkedQueue<Task>> LED_EXCHANGE = new ConcurrentHashMap<>();
 
     /**
      * mq 浜ゆ崲鏈哄垵濮嬪寲
      */
     public static void init(SlaveType type, Slave slave) {
         switch (type) {
-            case Crn:
-                CRN_EXCHANGE.put(slave.getId(), new LinkedBlockingQueue<>(1));
+            case Shuttle:
+                SHUTTLE_EXCHANGE.put(slave.getId(), new ConcurrentLinkedQueue<>());
                 break;
-            case Ste:
-                STE_EXCHANGE.put(slave.getId(), new LinkedBlockingQueue<>(1));
+            case ForkLift:
+                FORK_LIFT_EXCHANGE.put(slave.getId(), new ConcurrentLinkedQueue<>());
+                break;
+            case ForkLiftMaster:
+                FORK_LIFT_MASTER_EXCHANGE.put(slave.getId(), new ConcurrentLinkedQueue<>());
+                break;
+            case Lift:
+                LIFT_EXCHANGE.put(slave.getId(), new ConcurrentLinkedQueue<>());
                 break;
             case Devp:
                 DEVP_EXCHANGE.put(slave.getId(), new ConcurrentLinkedQueue<>());
                 break;
-            case Barcode:
-                BARCODE_EXCHANGE.put(slave.getId(), new ConcurrentLinkedQueue<>());
-                break;
             case Led:
-                LED_EXCHANGE.put(slave.getId(), new LinkedBlockingQueue<>(1));
-                break;
-            case Scale:
-                SCALE_EXCHANGE.put(slave.getId(), new ConcurrentLinkedQueue<>());
-                break;
-            case Car:
-                CAR_EXCHANGE.put(slave.getId(), new ConcurrentLinkedQueue<>());
-                break;
-            case Shuttle:
-                SHUTTLE_EXCHANGE.put(slave.getId(), new ConcurrentLinkedQueue<>());
-                break;
-            case Lift:
-                LIFT_EXCHANGE.put(slave.getId(), new ConcurrentLinkedQueue<>());
+                LED_EXCHANGE.put(slave.getId(), new ConcurrentLinkedQueue<>());
                 break;
             default:
                 break;
@@ -77,24 +61,18 @@
      */
     public static boolean offer(SlaveType type, Integer id, Task task) {
         switch (type) {
-            case Crn:
-                return CRN_EXCHANGE.get(id).offer(task);
-            case Ste:
-                return STE_EXCHANGE.get(id).offer(task);
-            case Devp:
-                return DEVP_EXCHANGE.get(id).offer(task);
-            case Barcode:
-                return BARCODE_EXCHANGE.get(id).offer(task);
-            case Led:
-                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);
             case Shuttle:
                 return SHUTTLE_EXCHANGE.get(id).offer(task);
+            case ForkLift:
+                return FORK_LIFT_EXCHANGE.get(id).offer(task);
+            case ForkLiftMaster:
+                return FORK_LIFT_MASTER_EXCHANGE.get(id).offer(task);
             case Lift:
                 return LIFT_EXCHANGE.get(id).offer(task);
+            case Devp:
+                return DEVP_EXCHANGE.get(id).offer(task);
+            case Led:
+                return LED_EXCHANGE.get(id).offer(task);
             default:
                 return false;
         }
@@ -106,24 +84,26 @@
      */
     public static Task poll(SlaveType type, Integer id) {
         switch (type) {
-            case Crn:
-                return CRN_EXCHANGE.get(id).poll();
-            case Ste:
-                return STE_EXCHANGE.get(id).poll();
-            case Devp:
-                return DEVP_EXCHANGE.get(id).poll();
-            case Barcode:
-                return BARCODE_EXCHANGE.get(id).poll();
-            case Led:
-                return LED_EXCHANGE.get(id).poll();
-            case Scale:
-                return SCALE_EXCHANGE.get(id).poll();
-            case Car:
-                return CAR_EXCHANGE.get(id).poll();
             case Shuttle:
                 return SHUTTLE_EXCHANGE.get(id).poll();
+            case ForkLift:
+                return FORK_LIFT_EXCHANGE.get(id).poll();
+            case ForkLiftMaster:
+                return FORK_LIFT_MASTER_EXCHANGE.get(id).poll();
             case Lift:
                 return LIFT_EXCHANGE.get(id).poll();
+            case Devp:
+                ConcurrentLinkedQueue<Task> tasks = DEVP_EXCHANGE.get(id);
+                if (tasks == null) {
+                    return null;
+                }
+                return DEVP_EXCHANGE.get(id).poll();
+            case Led:
+                ConcurrentLinkedQueue<Task> task2 = LED_EXCHANGE.get(id);
+                if (task2 == null) {
+                    return null;
+                }
+                return LED_EXCHANGE.get(id).poll();
             default:
                 return null;
         }
@@ -134,57 +114,42 @@
      */
     public static Task peek(SlaveType type, Integer id) {
         switch (type) {
-            case Crn:
-                return CRN_EXCHANGE.get(id).peek();
-            case Ste:
-                return STE_EXCHANGE.get(id).peek();
-            case Devp:
-                return DEVP_EXCHANGE.get(id).peek();
-            case Barcode:
-                return BARCODE_EXCHANGE.get(id).peek();
-            case Led:
-                return LED_EXCHANGE.get(id).peek();
-            case Scale:
-                return SCALE_EXCHANGE.get(id).peek();
-            case Car:
-                return CAR_EXCHANGE.get(id).peek();
             case Shuttle:
                 return SHUTTLE_EXCHANGE.get(id).peek();
+            case ForkLift:
+                return FORK_LIFT_EXCHANGE.get(id).peek();
+            case ForkLiftMaster:
+                return FORK_LIFT_MASTER_EXCHANGE.get(id).peek();
             case Lift:
                 return LIFT_EXCHANGE.get(id).peek();
+            case Devp:
+                return DEVP_EXCHANGE.get(id).peek();
+            case Led:
+                return LED_EXCHANGE.get(id).peek();
             default:
                 return null;
         }
     }
 
-    public static void clear(SlaveType type, Integer id){
+    public static void clear(SlaveType type, Integer id) {
         switch (type) {
-            case Crn:
-                CRN_EXCHANGE.get(id).clear();
+            case Shuttle:
+                SHUTTLE_EXCHANGE.get(id).clear();
                 break;
-            case Ste:
-                STE_EXCHANGE.get(id).clear();
+            case ForkLift:
+                FORK_LIFT_EXCHANGE.get(id).clear();
+                break;
+            case ForkLiftMaster:
+                FORK_LIFT_MASTER_EXCHANGE.get(id).clear();
+                break;
+            case Lift:
+                LIFT_EXCHANGE.get(id).clear();
                 break;
             case Devp:
                 DEVP_EXCHANGE.get(id).clear();
                 break;
-            case Barcode:
-                BARCODE_EXCHANGE.get(id).clear();
-                break;
             case Led:
                 LED_EXCHANGE.get(id).clear();
-                break;
-            case Scale:
-                SCALE_EXCHANGE.get(id).clear();
-                break;
-            case Car:
-                CAR_EXCHANGE.get(id).clear();
-                break;
-            case Shuttle:
-                SHUTTLE_EXCHANGE.get(id).clear();
-                break;
-            case Lift:
-                LIFT_EXCHANGE.get(id).clear();
                 break;
             default:
                 break;

--
Gitblit v1.9.1