From a5e366c9143ff99bc5f707048a73f93a8d444bb8 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 08 四月 2025 16:23:32 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/core/thread/LedThread.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/LedThread.java b/src/main/java/com/zy/core/thread/LedThread.java
index 36e9753..40a3dea 100644
--- a/src/main/java/com/zy/core/thread/LedThread.java
+++ b/src/main/java/com/zy/core/thread/LedThread.java
@@ -5,6 +5,7 @@
import com.zy.core.ThreadHandler;
import com.zy.core.cache.MessageQueue;
import com.zy.core.enums.SlaveType;
+import com.zy.core.model.ErrMsg;
import com.zy.core.model.Task;
import com.zy.core.model.command.LedCommand;
import lombok.Data;
@@ -44,7 +45,7 @@
private List<LedCommand> commandList;
// private StringBuffer errorMsg = new StringBuffer();
- private Map<String,String> errorMsg = new LinkedHashMap<>();
+ private List<ErrMsg> errorMsg = new ArrayList<>();
public LedThread(Slave slave) {
this.slave = slave;
@@ -84,7 +85,7 @@
reset7();
break;
case 5:
- error((Map<String,String>) task.getData());
+ error((ErrMsg)task.getData());
break;
case 6:
errorReset();
@@ -228,9 +229,20 @@
}
- private void error(Map<String,String> msg) {
- errorMsg.clear();
- errorMsg.putAll(msg);
+ private void error(ErrMsg errMsg) {
+// errorMsg.clear();
+ ErrMsg errMsOld = null;
+ for (ErrMsg errMsg1 : errorMsg){
+ if (errMsg1.getId()==1){
+ errMsOld = errMsg1;
+ }
+ errMsg1.setId(errMsg1.getId()-1);
+ }
+ if (errMsOld != null){
+ errorMsg.remove(errMsOld);
+ }
+ errMsg.setId(errMsg.getIdCode());
+ errorMsg.add(errMsg);
}
public void errorReset() {
--
Gitblit v1.9.1