From c808221f6a427014d8c112d172f5a1e58abab197 Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期一, 26 五月 2025 18:37:12 +0800
Subject: [PATCH] 环境文件备份，数据库备份
---
src/main/java/com/zy/core/thread/LedThread.java | 31 ++++++++++++++++++++-----------
1 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/LedThread.java b/src/main/java/com/zy/core/thread/LedThread.java
index 0cbc00a..40a3dea 100644
--- a/src/main/java/com/zy/core/thread/LedThread.java
+++ b/src/main/java/com/zy/core/thread/LedThread.java
@@ -1,13 +1,11 @@
package com.zy.core.thread;
-import com.alibaba.fastjson.JSON;
-import com.core.common.Cools;
-import com.zy.common.entity.Parameter;
import com.zy.common.model.MatDto;
import com.zy.core.Slave;
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;
@@ -23,9 +21,8 @@
import onbon.bx05.utils.DisplayStyleFactory;
import java.awt.*;
-import java.util.HashSet;
+import java.util.*;
import java.util.List;
-import java.util.Set;
/**
* Created by vincent on 2020/9/1
@@ -47,7 +44,8 @@
private StringBuffer stringBuffer = new StringBuffer();
private List<LedCommand> commandList;
- private StringBuffer errorMsg = new StringBuffer();
+// private StringBuffer errorMsg = new StringBuffer();
+ private List<ErrMsg> errorMsg = new ArrayList<>();
public LedThread(Slave slave) {
this.slave = slave;
@@ -87,7 +85,7 @@
reset7();
break;
case 5:
- error((String) task.getData());
+ error((ErrMsg)task.getData());
break;
case 6:
errorReset();
@@ -231,13 +229,24 @@
}
- private void error(String msg) {
- errorMsg.delete(0, errorMsg.length());
- errorMsg.append(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() {
- this.errorMsg.delete(0, errorMsg.length());
+ this.errorMsg.clear();
}
@Override
--
Gitblit v1.9.1