From 9f05696822f8feee385a34a92dd9aa16009e84a0 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期日, 18 六月 2023 12:38:00 +0800
Subject: [PATCH] 寻路算法，地图节点优化，剔除原入出库模式获取地图节点方案，改为根据库位状态实时获取节点信息或直接获取无过滤的完整节点信息
---
src/main/java/com/zy/core/cache/MessageQueue.java | 56 ++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 42 insertions(+), 14 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..ec0be29 100644
--- a/src/main/java/com/zy/core/cache/MessageQueue.java
+++ b/src/main/java/com/zy/core/cache/MessageQueue.java
@@ -15,8 +15,6 @@
*/
public class MessageQueue {
- // 鍫嗗灈鏈簃q浜ゆ崲鏈�
- private static final Map<Integer, ConcurrentLinkedQueue<Task>> CRN_EXCHANGE = new ConcurrentHashMap<>();
// 杈撻�佺嚎mq浜ゆ崲鏈�
private static final Map<Integer, ConcurrentLinkedQueue<Task>> DEVP_EXCHANGE = new ConcurrentHashMap<>();
// 鏉＄爜鎵弿浠猰q浜ゆ崲鏈�
@@ -25,15 +23,18 @@
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 浜ゆ崲鏈哄垵濮嬪寲
*/
public static void init(SlaveType type, Slave slave) {
switch (type) {
- case Crn:
- CRN_EXCHANGE.put(slave.getId(), new ConcurrentLinkedQueue<>());
- break;
case Devp:
DEVP_EXCHANGE.put(slave.getId(), new ConcurrentLinkedQueue<>());
break;
@@ -46,6 +47,15 @@
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;
}
@@ -57,8 +67,6 @@
*/
public static boolean offer(SlaveType type, Integer id, Task task) {
switch (type) {
- case Crn:
- return CRN_EXCHANGE.get(id).offer(task);
case Devp:
return DEVP_EXCHANGE.get(id).offer(task);
case Barcode:
@@ -67,6 +75,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;
}
@@ -78,8 +92,6 @@
*/
public static Task poll(SlaveType type, Integer id) {
switch (type) {
- case Crn:
- return CRN_EXCHANGE.get(id).poll();
case Devp:
return DEVP_EXCHANGE.get(id).poll();
case Barcode:
@@ -88,6 +100,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;
}
@@ -98,8 +116,6 @@
*/
public static Task peek(SlaveType type, Integer id) {
switch (type) {
- case Crn:
- return CRN_EXCHANGE.get(id).peek();
case Devp:
return DEVP_EXCHANGE.get(id).peek();
case Barcode:
@@ -108,6 +124,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;
}
@@ -115,9 +137,6 @@
public static void clear(SlaveType type, Integer id){
switch (type) {
- case Crn:
- CRN_EXCHANGE.get(id).clear();
- break;
case Devp:
DEVP_EXCHANGE.get(id).clear();
break;
@@ -130,6 +149,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