From bfa13c51fa8a839c927f74e250a076e53f0b089c Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期二, 24 六月 2025 20:39:01 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/LedThread.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/LedThread.java b/src/main/java/com/zy/core/thread/LedThread.java
index 9a2ba4f..6b8306b 100644
--- a/src/main/java/com/zy/core/thread/LedThread.java
+++ b/src/main/java/com/zy/core/thread/LedThread.java
@@ -57,7 +57,7 @@
// screen = new Bx5GScreenClient("my");
} catch (Exception e) {
e.printStackTrace();
- News.info("led杩炴帴鏋勯�犲櫒閿欒 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ News.info("Led"+" - 1"+" - led杩炴帴鏋勯�犲櫒閿欒 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
}
}
@@ -144,7 +144,7 @@
area.addPage(page);
pf.addArea(area);
if (pf.validate() != null) {
- News.info("pf out of range");
+ News.info("Led"+" - 2"+" - pf out of range");
} else {
// 鏇存柊鑺傜洰
screen.writeProgram(pf);
@@ -194,7 +194,7 @@
pf.addArea(area);
// 鏇存柊鑺傜洰
if (pf.validate() != null) {
- News.info("pf out of range");
+ News.info("Led"+" - 3"+" - pf out of range");
} else {
// 鏇存柊鑺傜洰
screen.writeProgram(pf);
@@ -205,7 +205,7 @@
private void write7(List<LedCommand> list) {
commandList = list;
-
+ this.ledMk = false;
StringBuilder sb = new StringBuilder();
for (LedCommand command : list) {
sb.append(command.getTitle()).append("锛�").append(command.getWorkNo()).append(")").append("\n");
@@ -215,6 +215,7 @@
for (MatDto matDto : command.getMatDtos()) {
sb.append("鐗╂枡缂栫爜锛�").append(matDto.getMatnr()).append("\n");
sb.append("鏁伴噺锛�").append(matDto.getCount()).append("\n");
+ sb.append("瑙勬牸锛�").append(matDto.getSpecs()).append("\n");
}
}
sb.append("\n");
@@ -228,14 +229,15 @@
private void reset7() {
commandList = null;
-
stringBuffer.delete(0, stringBuffer.length());
+ errorMsg.delete(0, errorMsg.length());
}
private void error(String msg) {
errorMsg.delete(0, errorMsg.length());
errorMsg.append(msg);
+ this.ledMk = false;
}
public void errorReset() {
@@ -251,9 +253,9 @@
} catch (Exception ignore) {
}
if (connRes) {
- News.info("led杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ News.info("Led"+" - 4"+" - led杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
} else {
- log.error("led杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ News.error("Led"+" - 5"+" - led杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
}
return connRes;
}
@@ -310,7 +312,7 @@
// 鏇存柊鑺傜洰
if (pf.validate() != null) {
System.out.println("pf out of range");
- News.info("pf out of range");
+ News.info("Led"+" - 6"+" - pf out of range");
} else {
// 鏇存柊鑺傜洰
screen.writeProgram(pf);
--
Gitblit v1.9.1