From 0e0cf6f88516ca1aad92a0f2df7129a95dc4d1fc Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 10 四月 2023 13:48:45 +0800
Subject: [PATCH] 四向穿梭车界面+错误码
---
src/main/java/com/zy/core/cache/MessageQueue.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 58 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..cad0ffb 100644
--- a/src/main/java/com/zy/core/cache/MessageQueue.java
+++ b/src/main/java/com/zy/core/cache/MessageQueue.java
@@ -16,7 +16,9 @@
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<>();
+ // 绌挎杞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浜ゆ崲鏈�
@@ -25,6 +27,12 @@
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<>();
/**
* mq 浜ゆ崲鏈哄垵濮嬪寲
@@ -32,7 +40,10 @@
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 Ste:
+ STE_EXCHANGE.put(slave.getId(), new LinkedBlockingQueue<>(1));
break;
case Devp:
DEVP_EXCHANGE.put(slave.getId(), new ConcurrentLinkedQueue<>());
@@ -45,6 +56,15 @@
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<>());
break;
default:
break;
@@ -59,6 +79,8 @@
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:
@@ -67,6 +89,12 @@
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;
}
@@ -80,6 +108,8 @@
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:
@@ -88,6 +118,12 @@
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;
}
@@ -100,6 +136,8 @@
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:
@@ -108,6 +146,12 @@
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;
}
@@ -117,6 +161,9 @@
switch (type) {
case Crn:
CRN_EXCHANGE.get(id).clear();
+ break;
+ case Ste:
+ STE_EXCHANGE.get(id).clear();
break;
case Devp:
DEVP_EXCHANGE.get(id).clear();
@@ -130,6 +177,15 @@
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