From 144a8f7afde1370855dbd39ef525f2d70e522790 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 04 十一月 2023 15:56:32 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/LedThread.java | 3 ---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 6 +++++-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index f8b2e5d..ff301d6 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2456,7 +2456,8 @@
if (!MessageQueue.offer(SlaveType.Led, led.getId(), new Task(4, new ArrayList<>()))) {
News.error(" - {}鍙稬ED鍛戒护涓嬪彂澶辫触锛侊紒锛乕ip锛歿}] [port锛歿}]", led.getId(), led.getIp(), led.getPort());
} else {
-
+ News.error("{}鍙稬ED鍛戒护涓嬪彂鎴愬姛锛侊紒锛乕ip锛歿}] [port锛歿}]", led.getId(), led.getIp(), led.getPort());
+ ledThread.setLedMk(false);
}
}
}
@@ -2481,6 +2482,9 @@
ledThread.setLedMk(true);
if (!MessageQueue.offer(SlaveType.Led, led.getId(), new Task(2, new ArrayList<>()))) {
News.error("{}鍙稬ED鍛戒护涓嬪彂澶辫触锛侊紒锛乕ip锛歿}] [port锛歿}]", led.getId(), led.getIp(), led.getPort());
+ }else {
+ News.error("{}鍙稬ED鍛戒护涓嬪彂鎴愬姛锛侊紒锛乕ip锛歿}] [port锛歿}]", led.getId(), led.getIp(), led.getPort());
+ ledThread.setLedMk(false);
}
}
}
diff --git a/src/main/java/com/zy/core/thread/LedThread.java b/src/main/java/com/zy/core/thread/LedThread.java
index 4c89da6..2701abb 100644
--- a/src/main/java/com/zy/core/thread/LedThread.java
+++ b/src/main/java/com/zy/core/thread/LedThread.java
@@ -105,19 +105,16 @@
private void reset() {
commandList = null;
stringBuffer.delete(0, stringBuffer.length());
- this.ledMk = false;
}
private void error(String msg) {
errorMsg.delete(0, errorMsg.length());
errorMsg.append(msg);
- this.ledMk = false;
}
public void errorReset() {
this.errorMsg.delete(0, errorMsg.length());
- this.ledMk = false;
}
@Override
--
Gitblit v1.9.1