From b66fdb94566a2ea6ce902b1290ea218c58140526 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 05 二月 2021 11:53:25 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/LedThread.java | 10 +++++-----
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 2 +-
2 files changed, 6 insertions(+), 6 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 f8b3fb2..c995ce2 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1072,7 +1072,7 @@
// 鑾峰彇led绾跨▼
LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, led.getDevpPlcId());
// led鏄剧ず榛樿鍐呭
- if (!ledThread.isResetStatus() && reset) {
+ if (reset) {
if (!MessageQueue.offer(SlaveType.Led, led.getId(), new Task(2, new ArrayList<>()))) {
log.error("{}鍙稬ED鍛戒护涓嬪彂澶辫触锛侊紒锛乕ip锛歿}] [port锛歿}]", led.getId(), led.getIp(), led.getPort());
}
diff --git a/src/main/java/com/zy/core/thread/LedThread.java b/src/main/java/com/zy/core/thread/LedThread.java
index 9c57985..cc88d09 100644
--- a/src/main/java/com/zy/core/thread/LedThread.java
+++ b/src/main/java/com/zy/core/thread/LedThread.java
@@ -37,7 +37,7 @@
TextCaptionBxArea area;
DisplayStyleFactory.DisplayStyle[] styles = DisplayStyleFactory.getStyles().toArray(new DisplayStyleFactory.DisplayStyle[0]);
private Set<Integer> workNos = new HashSet<>();
- private boolean resetStatus = false; // 澶嶄綅鐘舵��
+// private boolean resetStatus = false; // 澶嶄綅鐘舵��
// 鏄剧ず鍣�
private StringBuffer stringBuffer = new StringBuffer();
@@ -148,11 +148,11 @@
}
stringBuffer.delete(0, stringBuffer.length());
stringBuffer.append(sb.toString());
- resetStatus = false;
+// resetStatus = false;
}
private void reset() throws Bx5GException {
- if (!resetStatus) {
+// if (!resetStatus) {
// pf = new ProgramBxFile( 0, screen.getProfile());
// pf.setFrameShow(false);
// // 鍒嗗埆杈撳叆X锛孻锛寃idth锛宧eight
@@ -173,8 +173,8 @@
// screen.writeProgram(pf);
stringBuffer.delete(0, stringBuffer.length());
- resetStatus = true;
- }
+// resetStatus = true;
+// }
}
--
Gitblit v1.9.1