From f57741a11f0cce1f7ac0f2c8ab0627c046cb855b Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 14 四月 2023 11:11:53 +0800
Subject: [PATCH] 穿梭车到达提升机口前，优先调度提升机优化
---
src/main/java/com/zy/core/cache/MessageQueue.java | 46 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 44 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 8bb9d7c..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浜ゆ崲鏈�
@@ -27,6 +29,10 @@
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 浜ゆ崲鏈哄垵濮嬪寲
@@ -34,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<>());
@@ -51,6 +60,12 @@
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;
}
@@ -64,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:
@@ -74,6 +91,10 @@
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;
}
@@ -87,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:
@@ -97,6 +120,10 @@
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;
}
@@ -109,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:
@@ -119,6 +148,10 @@
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;
}
@@ -128,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();
@@ -144,6 +180,12 @@
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