From 925b834a3341dbe9f486964a7ad5d1affd7a404d Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 24 十月 2023 13:33:05 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/NyShuttleThread.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/NyShuttleThread.java b/src/main/java/com/zy/core/thread/NyShuttleThread.java
index 3773fc7..a84ca61 100644
--- a/src/main/java/com/zy/core/thread/NyShuttleThread.java
+++ b/src/main/java/com/zy/core/thread/NyShuttleThread.java
@@ -370,6 +370,7 @@
return false;
}
+ NavigateMapUtils navigateMapUtils = SpringUtils.getBean(NavigateMapUtils.class);
WrkMastMapper wrkMastMapper = SpringUtils.getBean(WrkMastMapper.class);
WrkMast wrkMast = wrkMastMapper.selectByWorkNo(wrkNo.intValue());
@@ -388,8 +389,6 @@
}
checkIOSta(commands, commandStep);//妫�娴嬪皬杞︽槸鍚﹁繘鍑烘彁鍗囨満杈撻�佺珯
-
- NavigateMapData navigateMapData = new NavigateMapData(Utils.getLev(shuttleProtocol.getCurrentLocNo()));
boolean isLock = false;//鏄惁瑙ｉ攣璺緞
//鍙栧嚭鍛戒护
@@ -414,7 +413,10 @@
// nodes.addAll(command.getNodes());
// }
if (nodes != null) {
- navigateMapData.writeNavigateNodeToRedisMap(nodes, false);//瑙ｉ攣璺緞
+ boolean result = navigateMapUtils.writeNavigateNodeToRedisMap(Utils.getLev(shuttleProtocol.getCurrentLocNo()), nodes, false);//瑙ｉ攣璺緞
+ if (!result) {
+ return false;//瑙ｉ攣澶辫触
+ }
isLock = true;//瑙ｉ攣杩囪矾寰�
}
}
@@ -500,7 +502,7 @@
nodes.addAll(nextNodes);
}
if (nodes != null) {
- boolean result = navigateMapData.writeNavigateNodeToRedisMap(nodes, true);//鎵�浣跨敤鐨勮矾寰勮繘琛岄攣瀹氱鐢�
+ boolean result = navigateMapUtils.writeNavigateNodeToRedisMap(Utils.getLev(shuttleProtocol.getCurrentLocNo()), nodes, true);//鎵�浣跨敤鐨勮矾寰勮繘琛岄攣瀹氱鐢�
if (!result) {
return false;//璺緞閿佸畾澶辫触
}
--
Gitblit v1.9.1