From c12e04926ca5d56f324aefa904df4c2aac76a9a8 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 29 十一月 2023 15:25:52 +0800
Subject: [PATCH] #指令更新
---
src/main/java/com/zy/asrs/utils/CommandUtils.java | 56 ++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 36 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/CommandUtils.java b/src/main/java/com/zy/asrs/utils/CommandUtils.java
index 86f59fc..a18ce22 100644
--- a/src/main/java/com/zy/asrs/utils/CommandUtils.java
+++ b/src/main/java/com/zy/asrs/utils/CommandUtils.java
@@ -7,6 +7,8 @@
import com.zy.asrs.service.CommandInfoService;
import com.zy.asrs.service.TaskWrkService;
import com.zy.core.cache.MessageQueue;
+import com.zy.core.enums.CommandStatusType;
+import com.zy.core.enums.CommandType;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.Task;
import com.zy.core.model.command.CrnCommand;
@@ -18,6 +20,10 @@
public class CommandUtils {
public static boolean offer(SlaveType type, Integer id, Task task) {
+ return offer(type, id, task, true);
+ }
+
+ public static boolean offer(SlaveType type, Integer id, Task task, Boolean auto) {
CommandInfoService commandInfoService = SpringUtils.getBean(CommandInfoService.class);
if (commandInfoService == null) {
return false;
@@ -36,7 +42,7 @@
CommandPackage<CrnCommand> commandPackage = new CommandPackage<>();
CrnCommand command = (CrnCommand) task.getData();
wrkNo = command.getTaskNo();
- if (wrkNo != 0) {
+ if (auto && wrkNo != 0) {
taskWrk = taskWrkService.selectByWrkNo(wrkNo);
taskNo = taskWrk.getTaskNo();
}
@@ -44,27 +50,32 @@
commandInfo = new CommandInfo();
commandInfo.setWrkNo(wrkNo);
commandInfo.setTaskNo(taskNo);
- commandInfo.setCommandStatus(1);
+ commandInfo.setCommandStatus(CommandStatusType.CREATE.id);
commandInfo.setStartTime(new Date());
commandInfo.setDevice(SlaveType.Crn.toString());
+ commandInfo.setCommandType(auto? CommandType.AUTO.id : CommandType.MANUAL.id);
- commandPackage.setWrkNo(wrkNo);
- commandPackage.setCommand(command);
- commandPackage.setDevice("鍫嗗灈鏈�");
-
- commandInfo.setCommand(JSON.toJSONString(commandPackage));
commandInfoService.insert(commandInfo);//鎻掑叆鎸囦护
- //灏嗘寚浠よ繘琛屾姇閫�
- if (!MessageQueue.offer(type, id, task)) {
- return false;
+ command.setCommandId(commandInfo.getId());
+ commandPackage.setWrkNo(wrkNo);
+ commandPackage.setDevice("鍫嗗灈鏈�");
+ commandPackage.setCommand(command);//淇濆瓨鍛戒护鎶ユ枃
+ commandInfo.setCommand(JSON.toJSONString(commandPackage));
+ commandInfoService.updateById(commandInfo);
+
+ if (!auto) {
+ //灏嗘寚浠よ繘琛屾姇閫�
+ if (!MessageQueue.offer(type, id, task)) {
+ return false;
+ }
}
return true;
} else if (type == SlaveType.Devp) {
CommandPackage<StaProtocol> commandPackage = new CommandPackage<>();
StaProtocol staProtocol = (StaProtocol) task.getData();
wrkNo = staProtocol.getWorkNo();
- if (wrkNo != 0) {
+ if (auto && wrkNo != 0) {
taskWrk = taskWrkService.selectByWrkNo(wrkNo);
taskNo = taskWrk.getTaskNo();
}
@@ -72,20 +83,25 @@
commandInfo = new CommandInfo();
commandInfo.setWrkNo(wrkNo);
commandInfo.setTaskNo(taskNo);
- commandInfo.setCommandStatus(1);
+ commandInfo.setCommandStatus(CommandStatusType.CREATE.id);
commandInfo.setStartTime(new Date());
commandInfo.setDevice(SlaveType.Devp.toString());
+ commandInfo.setCommandType(auto? CommandType.AUTO.id : CommandType.MANUAL.id);
- commandPackage.setWrkNo(wrkNo);
- commandPackage.setCommand(staProtocol);
- commandPackage.setDevice("杈撻�佺嚎");
-
- commandInfo.setCommand(JSON.toJSONString(commandPackage));
commandInfoService.insert(commandInfo);//鎻掑叆鎸囦护
- //灏嗘寚浠よ繘琛屾姇閫�
- if (!MessageQueue.offer(type, id, task)) {
- return false;
+ staProtocol.setCommandId(commandInfo.getId());
+ commandPackage.setCommand(staProtocol);
+ commandPackage.setWrkNo(wrkNo);
+ commandPackage.setDevice("杈撻�佺嚎");
+ commandInfo.setCommand(JSON.toJSONString(commandPackage));//淇濆瓨鍛戒护鎶ユ枃
+ commandInfoService.updateById(commandInfo);
+
+ if (!auto) {
+ //灏嗘寚浠よ繘琛屾姇閫�
+ if (!MessageQueue.offer(type, id, task)) {
+ return false;
+ }
}
return true;
}
--
Gitblit v1.9.1