From 056c514524eff0ca466e920191ddd551e6821062 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 09 五月 2023 15:57:04 +0800
Subject: [PATCH] ShuttleThread fixed
---
src/main/java/com/zy/core/thread/ShuttleThread.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/ShuttleThread.java b/src/main/java/com/zy/core/thread/ShuttleThread.java
index a834aac..59f53cf 100644
--- a/src/main/java/com/zy/core/thread/ShuttleThread.java
+++ b/src/main/java/com/zy/core/thread/ShuttleThread.java
@@ -178,7 +178,7 @@
if (shuttleProtocol.getErrorCode() != 0 && shuttleProtocol.getProtocolStatusType() == ShuttleProtocolStatusType.WORKING) {
//鍑虹幇閿欒
- reset(shuttleProtocol.getAssignCommand());
+ reset(shuttleProtocol.getTaskNo());
}
if(shuttleProtocol.getProtocolStatusType() == ShuttleProtocolStatusType.FIXING
@@ -950,19 +950,19 @@
/**
* 澶嶄綅骞跺皾璇曚慨澶嶉敊璇�
*/
- private boolean reset(ShuttleAssignCommand assignCommand) {
+ private boolean reset(Short wrkNo) {
//璇诲彇redis鏁版嵁
- if (assignCommand == null) {
+ if (wrkNo == null) {
return false;
}
- Object o = redisUtil.get("wrk_no_" + assignCommand.getTaskNo());
+ Object o = redisUtil.get("wrk_no_" + wrkNo);
if (o == null) {
return false;
}
ShuttleRedisCommand redisCommand = JSON.parseObject(o.toString(), ShuttleRedisCommand.class);
- List<ShuttleCommand> commands = assignCommand.getCommands();
+ List<ShuttleCommand> commands = redisCommand.getAssignCommand().getCommands();
//褰撳墠姝ュ簭
int commandStep = redisCommand.getCommandStep();
//path璺緞鏁扮洰
@@ -1027,7 +1027,7 @@
redisCommand.setErrorCommands(list);
//浠诲姟鏁版嵁淇濆瓨鍒皉edis
- redisUtil.set("wrk_no_" + assignCommand.getTaskNo(), JSON.toJSONString(redisCommand));
+ redisUtil.set("wrk_no_" + wrkNo, JSON.toJSONString(redisCommand));
shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.FIXING);
return true;
}
--
Gitblit v1.9.1