From 3adff2c549121bc166f49aa8de681265cd87b2d9 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期四, 19 六月 2025 09:49:09 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/LedThread.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/LedThread.java b/src/main/java/com/zy/core/thread/LedThread.java
index 9d44531..a0995f5 100644
--- a/src/main/java/com/zy/core/thread/LedThread.java
+++ b/src/main/java/com/zy/core/thread/LedThread.java
@@ -11,6 +11,7 @@
import com.zy.core.Slave;
import com.zy.core.ThreadHandler;
import com.zy.core.cache.MessageQueue;
+import com.zy.core.enums.CommandStatusType;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.Task;
import com.zy.core.model.command.LedCommand;
@@ -47,6 +48,7 @@
private Set<Integer> workNos = new HashSet<>();
private boolean ledMk = false;
private boolean resetStatus = false; // 澶嶄綅鐘舵��
+ private StringBuffer errorMsg = new StringBuffer();
public LedThread(Slave slave) {
this.slave = slave;
@@ -76,6 +78,9 @@
// 澶嶄綅
case 2:
reset();
+ break;
+ case 5:
+ error((String) task.getData());
break;
default:
break;
@@ -117,14 +122,11 @@
}
page.newLine("\n");
+ //鏇存柊鎸囦护鐘舵��
CommandInfoService commandInfoService = SpringUtils.getBean(CommandInfoService.class);
- CommandInfo commandInfo = new CommandInfo();
- commandInfo.setWrkNo(command.getWorkNo());
- commandInfo.setCommandStatus(1);
- commandInfo.setStartTime(new Date());
- commandInfo.setDevice("led");
- commandInfo.setCommand(JSON.toJSONString(command));
- commandInfoService.insert(commandInfo);
+ CommandInfo commandInfo = command.getCommandInfo();
+ commandInfo.setCommandStatus(CommandStatusType.COMPLETE.id);
+ commandInfoService.updateById(commandInfo);
}
// 璁剧疆瀛椾綋
@@ -461,8 +463,10 @@
//
// 缁у紑涓庢帶鍒跺櫒涔嬮棿鐨勯摼鎺�
screen.disconnect();
-
-
+ }
+ private void error(String msg) {
+ errorMsg.delete(0, errorMsg.length());
+ errorMsg.append(msg);
}
}
--
Gitblit v1.9.1