From b4e0f827567f8d5ad4a1ff5caa22675cbc165b88 Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期三, 11 六月 2025 10:27:31 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/LedThread.java | 74 +++++++++++++++++++++++++++++++++++--
1 files changed, 70 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/LedThread.java b/src/main/java/com/zy/core/thread/LedThread.java
index fecbd49..b8b340b 100644
--- a/src/main/java/com/zy/core/thread/LedThread.java
+++ b/src/main/java/com/zy/core/thread/LedThread.java
@@ -43,11 +43,17 @@
private boolean ledMk = false;
private boolean resetStatus = false; // 澶嶄綅鐘舵��
+ // 鏄剧ず鍣�
+ private StringBuffer stringBuffer = new StringBuffer();
+ private List<LedCommand> commandList;
+
+ private StringBuffer errorMsg = new StringBuffer();
+
public LedThread(Slave slave) {
this.slave = slave;
try {
- Bx5GEnv.initial(3000);
- screen = new Bx5GScreenClient("my");
+// Bx5GEnv.initial(3000);
+// screen = new Bx5GScreenClient("my");
} catch (Exception e) {
e.printStackTrace();
log.info("led杩炴帴鏋勯�犲櫒閿欒 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
@@ -57,7 +63,7 @@
@Override
@SuppressWarnings({"InfiniteLoopStatement", "unchecked"})
public void run() {
- connect();
+// connect();
close();
while (true) {
try {
@@ -71,6 +77,20 @@
// 澶嶄綅
case 2:
reset();
+ break;
+ // 鍐欐暟鎹� 娑叉櫠
+ case 3:
+ write7((List<LedCommand>)task.getData());
+ break;
+ // 澶嶄綅 娑叉櫠
+ case 4:
+ reset7();
+ break;
+ case 5:
+ error((String) task.getData());
+ break;
+ case 6:
+ errorReset();
break;
default:
break;
@@ -181,6 +201,52 @@
}
close();
}
+ private void write7(List<LedCommand> list) {
+ commandList = list;
+
+ StringBuilder sb = new StringBuilder();
+ for (LedCommand command : list) {
+ sb.append(command.getTitle()).append("锛�").append(command.getWorkNo()).append(")").append("\n");
+ sb.append("婧愬簱浣嶏細").append(command.getSourceLocNo()).append("\n");
+ sb.append("鐩爣绔欙細").append(command.getStaNo()).append("\n");
+ if (!command.isEmptyMk()) {
+ for (MatDto matDto : command.getMatDtos()) {
+ sb.append("鐗╂枡缂栫爜锛�").append(matDto.getMatNo()).append("\n");
+ sb.append("鏁伴噺锛�").append(matDto.getCount()).append("\n");
+ sb.append("绠卞彿锛�").append(matDto.getBatch()).append("\n");
+ sb.append("鍗峰彿锛�").append(matDto.getSpecs()).append("\n");
+ sb.append("璁㈠崟鍙凤細").append(matDto.getOrderNo()).append("\n");
+ sb.append("瀹㈡埛锛�").append(matDto.getCstmrName()).append("\n");
+ sb.append("澶囨敞锛�").append(matDto.getMemo()).append("\n");
+ sb.append("鎬讳綔涓氫腑鏁伴噺锛�").append(matDto.getCount1()).append("\n");
+ sb.append("鐮佸灈鍚庢湭鍙栬揣鏁伴噺锛�").append(matDto.getCount3()).append("\n");
+ sb.append("璁㈠崟浣滀笟涓暟閲忥細").append(matDto.getCount2()).append("\n");
+ }
+ }
+ sb.append("\n");
+ }
+ stringBuffer.delete(0, stringBuffer.length());
+ stringBuffer.append(sb.toString());
+
+ errorReset();
+ }
+
+
+ private void reset7() {
+ commandList = null;
+
+ stringBuffer.delete(0, stringBuffer.length());
+ }
+
+
+ private void error(String msg) {
+ errorMsg.delete(0, errorMsg.length());
+ errorMsg.append(msg);
+ }
+
+ public void errorReset() {
+ this.errorMsg.delete(0, errorMsg.length());
+ }
@Override
public boolean connect() {
@@ -200,7 +266,7 @@
@Override
public void close() {
- screen.disconnect();
+// screen.disconnect();
}
--
Gitblit v1.9.1