From 3b5b98a9911e3231cefe5ab4f47a4c9d94e5a2f7 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 28 十一月 2023 16:15:01 +0800
Subject: [PATCH] #将错误码存入备注字段进行展示
---
src/main/java/com/zy/asrs/utils/CommandUtils.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 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..38635d0 100644
--- a/src/main/java/com/zy/asrs/utils/CommandUtils.java
+++ b/src/main/java/com/zy/asrs/utils/CommandUtils.java
@@ -48,12 +48,14 @@
commandInfo.setStartTime(new Date());
commandInfo.setDevice(SlaveType.Crn.toString());
- commandPackage.setWrkNo(wrkNo);
- commandPackage.setCommand(command);
- commandPackage.setDevice("鍫嗗灈鏈�");
-
- commandInfo.setCommand(JSON.toJSONString(commandPackage));
commandInfoService.insert(commandInfo);//鎻掑叆鎸囦护
+
+ command.setCommandId(commandInfo.getId());
+ commandPackage.setWrkNo(wrkNo);
+ commandPackage.setDevice("鍫嗗灈鏈�");
+ commandPackage.setCommand(command);//淇濆瓨鍛戒护鎶ユ枃
+ commandInfo.setCommand(JSON.toJSONString(commandPackage));
+ commandInfoService.updateById(commandInfo);
//灏嗘寚浠よ繘琛屾姇閫�
if (!MessageQueue.offer(type, id, task)) {
@@ -76,13 +78,15 @@
commandInfo.setStartTime(new Date());
commandInfo.setDevice(SlaveType.Devp.toString());
- commandPackage.setWrkNo(wrkNo);
- commandPackage.setCommand(staProtocol);
- commandPackage.setDevice("杈撻�佺嚎");
-
- commandInfo.setCommand(JSON.toJSONString(commandPackage));
commandInfoService.insert(commandInfo);//鎻掑叆鎸囦护
+ staProtocol.setCommandId(commandInfo.getId());
+ commandPackage.setCommand(staProtocol);
+ commandPackage.setWrkNo(wrkNo);
+ commandPackage.setDevice("杈撻�佺嚎");
+ commandInfo.setCommand(JSON.toJSONString(commandPackage));//淇濆瓨鍛戒护鎶ユ枃
+ commandInfoService.updateById(commandInfo);
+
//灏嗘寚浠よ繘琛屾姇閫�
if (!MessageQueue.offer(type, id, task)) {
return false;
--
Gitblit v1.9.1