From 6b016cef0828cbd8ead4a2ff43d5bcb6e266a584 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 09 五月 2023 15:33:23 +0800
Subject: [PATCH] ShuttleThread and LiftThread task restart
---
src/main/java/com/zy/core/thread/LiftThread.java | 65 +++++++++++++-------------------
1 files changed, 27 insertions(+), 38 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/LiftThread.java b/src/main/java/com/zy/core/thread/LiftThread.java
index fc9225e..a656f4d 100644
--- a/src/main/java/com/zy/core/thread/LiftThread.java
+++ b/src/main/java/com/zy/core/thread/LiftThread.java
@@ -26,10 +26,7 @@
import com.zy.core.enums.*;
import com.zy.core.model.LiftSlave;
import com.zy.core.model.Task;
-import com.zy.core.model.command.LiftAssignCommand;
-import com.zy.core.model.command.LiftCommand;
-import com.zy.core.model.command.ShuttleAssignCommand;
-import com.zy.core.model.command.ShuttleCommand;
+import com.zy.core.model.command.*;
import com.zy.core.model.protocol.LiftProtocol;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
@@ -37,7 +34,6 @@
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Date;
-import java.util.HashMap;
import java.util.List;
/**
@@ -185,10 +181,9 @@
&& !liftProtocol.getRunning()
&& liftProtocol.getReady()
&& liftProtocol.getPakMk()
- && liftProtocol.getTaskNo() != 0
- && liftProtocol.getAssignCommand() != null) {
+ && liftProtocol.getTaskNo() != 0) {
//杩樻湁鏈畬鎴愮殑鍛戒护
- executeWork(liftProtocol.getAssignCommand());
+ executeWork(liftProtocol.getTaskNo());
}
//灏嗘彁鍗囨満鐘舵�佷繚瀛樿嚦鏁版嵁搴�
@@ -290,9 +285,6 @@
//鍒嗛厤浠诲姟
private void assignWork(LiftAssignCommand assignCommand) {
- //灏嗘map瀛樺叆redis涓�
- HashMap<String, Object> map = new HashMap<>();
-
//鎵嬪姩妯″紡鎸囦护
if (!assignCommand.getAuto()) {
LiftCommand command = new LiftCommand();
@@ -328,42 +320,40 @@
assignCommand.setCommands(commands);
}
- //鎻愬崌鏈哄彿
- map.put("lift_no", assignCommand.getLiftNo());
- //宸ヤ綔鍙�
- map.put("wrk_no", assignCommand.getTaskNo());
- //鍛戒护鎵ц姝ュ簭
- map.put("commandStep", 0);
- //鍛戒护
- map.put("assignCommand", assignCommand);
+ LiftRedisCommand redisCommand = new LiftRedisCommand();
+ redisCommand.setLiftNo(assignCommand.getLiftNo());//鎻愬崌鏈哄彿
+ redisCommand.setWrkNo(assignCommand.getTaskNo());//宸ヤ綔鍙�
+ redisCommand.setCommandStep(0);//鍛戒护鎵ц姝ュ簭
+ redisCommand.setAssignCommand(assignCommand);//鍛戒护
//浠诲姟鏁版嵁淇濆瓨鍒皉edis
- redisUtil.set("lift_wrk_no_" + assignCommand.getTaskNo(), JSON.toJSONString(map));
+ redisUtil.set("lift_wrk_no_" + assignCommand.getTaskNo(), JSON.toJSONString(redisCommand));
liftProtocol.setAssignCommand(assignCommand);
liftProtocol.setProtocolStatus(LiftProtocolStatusType.WORKING);
//鎵ц涓嬪彂浠诲姟
- executeWork(assignCommand);
+ executeWork(assignCommand.getTaskNo());
}
//鎵ц浠诲姟
- private boolean executeWork(LiftAssignCommand assignCommand) {
+ private boolean executeWork(Short wrkNo) {
//璇诲彇redis鏁版嵁
- if (assignCommand == null) {
+ if (wrkNo == null) {
return false;
}
//灏嗘爣璁扮疆涓篺alse(闃叉閲嶅彂)
liftProtocol.setPakMk(false);
- Object o = redisUtil.get("lift_wrk_no_" + assignCommand.getTaskNo());
+ Object o = redisUtil.get("lift_wrk_no_" + wrkNo);
if (o == null) {
return false;
}
- HashMap map = JSON.parseObject(o.toString(), HashMap.class);
- List<LiftCommand> commands = assignCommand.getCommands();
+ LiftRedisCommand redisCommand = JSON.parseObject(o.toString(), LiftRedisCommand.class);
+ List<LiftCommand> commands = redisCommand.getAssignCommand().getCommands();
//褰撳墠姝ュ簭
- int commandStep = Integer.parseInt(map.get("commandStep").toString());
+ int commandStep = redisCommand.getCommandStep();
//鎬绘搴�
int size = commands.size();
+ LiftAssignCommand assignCommand = redisCommand.getAssignCommand();
//鍙栧嚭鍛戒护
LiftCommand command = commands.get(commandStep);
@@ -379,17 +369,17 @@
//鏇存柊redis鏁版嵁
//姝ュ簭澧炲姞
commandStep++;
- map.put("commandStep", commandStep);
+ redisCommand.setCommandStep(commandStep);
//浠诲姟鏁版嵁淇濆瓨鍒皉edis
- redisUtil.set("lift_wrk_no_" + map.get("wrk_no").toString(), JSON.toJSONString(map));
+ redisUtil.set("lift_wrk_no_" + redisCommand.getWrkNo(), JSON.toJSONString(redisCommand));
}else {
//宸叉墽琛屽畬鎴�
//淇濆瓨鏁版嵁鍒版暟鎹簱鍋氭祦姘�
BasLiftOptService liftOptService = SpringUtils.getBean(BasLiftOptService.class);
if (liftOptService != null) {
BasLiftOpt opt = new BasLiftOpt(
- assignCommand.getTaskNo().intValue(),
- assignCommand.getLiftNo().intValue(),
+ redisCommand.getWrkNo().intValue(),
+ redisCommand.getLiftNo().intValue(),
new Date(),
null,
null,
@@ -399,7 +389,7 @@
liftOptService.insert(opt);
}
//鍒犻櫎redis
- redisUtil.del("lift_wrk_no_" + map.get("wrk_no").toString());
+ redisUtil.del("lift_wrk_no_" + redisCommand.getWrkNo());
if (assignCommand.getAuto()) {
//瀵逛富绾跨▼鎶涘嚭绛夊緟纭鐘舵�亀aiting
@@ -407,12 +397,11 @@
News.info("鎻愬崌鏈轰换鍔℃墽琛屽畬鎴愮瓑寰呯‘璁や腑锛屾彁鍗囨満鍙�={}锛屼换鍔℃暟鎹�={}", command.getLiftNo(), JSON.toJSON(command));
}else {
//鎵嬪姩妯″紡涓嶆姏鍑虹瓑寰呯姸鎬�
- if (assignCommand.getTaskMode() == 5) {
- liftProtocol.setTaskNo((short) 0);
- liftProtocol.setShuttleNo((short) 0);
- liftProtocol.setProtocolStatus(LiftProtocolStatusType.IDLE);
- liftProtocol.setPakMk(true);
- }
+ liftProtocol.setTaskNo((short) 0);
+ liftProtocol.setShuttleNo((short) 0);
+ liftProtocol.setProtocolStatus(LiftProtocolStatusType.IDLE);
+ liftProtocol.setPakMk(true);
+ liftProtocol.setSecurityMk(false);
News.info("鎻愬崌鏈烘墜鍔ㄤ换鍔℃墽琛屽畬鎴愶紝鎻愬崌鏈哄彿={}锛屼换鍔℃暟鎹�={}", command.getLiftNo(), JSON.toJSON(command));
}
--
Gitblit v1.9.1