From 6c85a6bd1ceaacd44c18bfb6a0dc3a9367d13d39 Mon Sep 17 00:00:00 2001
From: hmpc <hmpc>
Date: 星期一, 18 十一月 2024 14:34:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hcddwcs-gdfs' into hcddwcs-gdfs
---
src/main/java/com/zy/core/thread/LedThread.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/LedThread.java b/src/main/java/com/zy/core/thread/LedThread.java
index 9beff2f..40a3dea 100644
--- a/src/main/java/com/zy/core/thread/LedThread.java
+++ b/src/main/java/com/zy/core/thread/LedThread.java
@@ -230,7 +230,18 @@
private void error(ErrMsg errMsg) {
- errorMsg.clear();
+// 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);
}
--
Gitblit v1.9.1