From f9e2d3130f7bc3bb5230515703b0342e094af374 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 20 三月 2024 15:38:59 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/cache/MessageQueue.java | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/core/cache/MessageQueue.java b/src/main/java/com/zy/core/cache/MessageQueue.java
index 11d207d..b98b430 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;
@@ -7,6 +8,7 @@
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.LinkedBlockingQueue;
/**
* 娑堟伅闃熷垪
@@ -15,15 +17,17 @@
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浜ゆ崲鏈�
private static final Map<Integer, ConcurrentLinkedQueue<Task>> BARCODE_EXCHANGE = new ConcurrentHashMap<>();
// Led鐏� mq浜ゆ崲鏈�
- private static final Map<Integer, ConcurrentLinkedQueue<Task>> LED_EXCHANGE = new ConcurrentHashMap<>();
+ 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 浜ゆ崲鏈哄垵濮嬪寲
@@ -31,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<>());
@@ -40,10 +44,13 @@
BARCODE_EXCHANGE.put(slave.getId(), new ConcurrentLinkedQueue<>());
break;
case Led:
- LED_EXCHANGE.put(slave.getId(), new ConcurrentLinkedQueue<>());
+ 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;
default:
break;
@@ -66,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;
}
@@ -87,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;
}
@@ -107,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;
}
@@ -115,6 +128,7 @@
public static void clear(SlaveType type, Integer id){
switch (type) {
case Crn:
+
CRN_EXCHANGE.get(id).clear();
break;
case Devp:
@@ -129,6 +143,9 @@
case Scale:
SCALE_EXCHANGE.get(id).clear();
break;
+ case Car:
+ CAR_EXCHANGE.get(id).clear();
+ break;
default:
break;
}
--
Gitblit v1.9.1