From 1b4fbdb92537036aed4d648967ef7e7ab8842aec Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 13 十一月 2025 16:37:11 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/cache/MessageQueue.java |   81 ++++++++++++++++------------------------
 1 files changed, 33 insertions(+), 48 deletions(-)

diff --git a/src/main/java/com/zy/core/cache/MessageQueue.java b/src/main/java/com/zy/core/cache/MessageQueue.java
index ec0be29..fe3638b 100644
--- a/src/main/java/com/zy/core/cache/MessageQueue.java
+++ b/src/main/java/com/zy/core/cache/MessageQueue.java
@@ -1,6 +1,5 @@
 package com.zy.core.cache;
 
-import com.zy.core.Slave;
 import com.zy.core.enums.SlaveType;
 import com.zy.core.model.Task;
 
@@ -15,6 +14,8 @@
  */
 public class MessageQueue {
 
+    // 鍫嗗灈鏈簃q浜ゆ崲鏈�
+    private static final Map<Integer, LinkedBlockingQueue<Task>> CRN_EXCHANGE = new ConcurrentHashMap<>();
     // 杈撻�佺嚎mq浜ゆ崲鏈�
     private static final Map<Integer, ConcurrentLinkedQueue<Task>> DEVP_EXCHANGE = new ConcurrentHashMap<>();
     // 鏉$爜鎵弿浠猰q浜ゆ崲鏈�
@@ -23,38 +24,31 @@
     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>> LIFT_EXCHANGE = new ConcurrentHashMap<>();
+    // RGVmq浜ゆ崲鏈�
+    private static final Map<Integer, LinkedBlockingQueue<Task>> RGV_EXCHANGE = new ConcurrentHashMap<>();
 
     /**
      * mq 浜ゆ崲鏈哄垵濮嬪寲
      */
-    public static void init(SlaveType type, Slave slave) {
+    public static void init(SlaveType type, Integer id) {
         switch (type) {
+            case Crn:
+                CRN_EXCHANGE.put(id, new LinkedBlockingQueue<>(1));
+                break;
+            case Rgv:
+                RGV_EXCHANGE.put(id, new LinkedBlockingQueue<>(1));
+                break;
             case Devp:
-                DEVP_EXCHANGE.put(slave.getId(), new ConcurrentLinkedQueue<>());
+                DEVP_EXCHANGE.put(id, new ConcurrentLinkedQueue<>());
                 break;
             case Barcode:
-                BARCODE_EXCHANGE.put(slave.getId(), new ConcurrentLinkedQueue<>());
+                BARCODE_EXCHANGE.put(id, new ConcurrentLinkedQueue<>());
                 break;
             case Led:
-                LED_EXCHANGE.put(slave.getId(), new LinkedBlockingQueue<>(1));
+                LED_EXCHANGE.put(id, 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<>());
+                SCALE_EXCHANGE.put(id, new ConcurrentLinkedQueue<>());
                 break;
             default:
                 break;
@@ -67,6 +61,10 @@
      */
     public static boolean offer(SlaveType type, Integer id, Task task) {
         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:
@@ -75,12 +73,6 @@
                 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 Lift:
-                return LIFT_EXCHANGE.get(id).offer(task);
             default:
                 return false;
         }
@@ -92,6 +84,10 @@
      */
     public static Task poll(SlaveType type, Integer id) {
         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:
@@ -100,12 +96,6 @@
                 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 Lift:
-                return LIFT_EXCHANGE.get(id).poll();
             default:
                 return null;
         }
@@ -116,6 +106,10 @@
      */
     public static Task peek(SlaveType type, Integer id) {
         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:
@@ -124,12 +118,6 @@
                 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 Lift:
-                return LIFT_EXCHANGE.get(id).peek();
             default:
                 return null;
         }
@@ -137,6 +125,12 @@
 
     public static void clear(SlaveType type, Integer id){
         switch (type) {
+            case Crn:
+                CRN_EXCHANGE.get(id).clear();
+                break;
+            case Rgv:
+                RGV_EXCHANGE.get(id).clear();
+                break;
             case Devp:
                 DEVP_EXCHANGE.get(id).clear();
                 break;
@@ -148,15 +142,6 @@
                 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