From fbc6f70266ea5a69f023231f3fcc11878af07a93 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期六, 26 十月 2024 16:47:17 +0800
Subject: [PATCH] 外形检测304

---
 src/main/java/com/zy/core/cache/MessageQueue.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 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..62ae268 100644
--- a/src/main/java/com/zy/core/cache/MessageQueue.java
+++ b/src/main/java/com/zy/core/cache/MessageQueue.java
@@ -16,7 +16,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浜ゆ崲鏈�
@@ -34,7 +34,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<>());
@@ -92,7 +92,11 @@
             case Barcode:
                 return BARCODE_EXCHANGE.get(id).poll();
             case Led:
-                return LED_EXCHANGE.get(id).poll();
+                try {
+                    return LED_EXCHANGE.get(id).poll();
+                }catch (Exception e) {
+
+                }
             case Scale:
                 return SCALE_EXCHANGE.get(id).poll();
             case Car:
@@ -127,6 +131,7 @@
     public static void clear(SlaveType type, Integer id){
         switch (type) {
             case Crn:
+                
                 CRN_EXCHANGE.get(id).clear();
                 break;
             case Devp:

--
Gitblit v1.9.1