From 84f42d7198729df0823483183e9f9918db92fc17 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期六, 11 三月 2023 15:38:53 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/LedThread.java | 61 ++++++++----------------------
1 files changed, 17 insertions(+), 44 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/LedThread.java b/src/main/java/com/zy/core/thread/LedThread.java
index b263a9e..c272ffb 100644
--- a/src/main/java/com/zy/core/thread/LedThread.java
+++ b/src/main/java/com/zy/core/thread/LedThread.java
@@ -4,6 +4,7 @@
import com.core.common.Cools;
import com.zy.common.entity.Parameter;
import com.zy.common.model.MatDto;
+import com.zy.common.utils.News;
import com.zy.core.Slave;
import com.zy.core.ThreadHandler;
import com.zy.core.cache.MessageQueue;
@@ -52,18 +53,18 @@
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());
+ News.info("led杩炴帴鏋勯�犲櫒閿欒 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
}
}
@Override
@SuppressWarnings({"InfiniteLoopStatement", "unchecked"})
public void run() {
- connect();
+// connect();
close();
while (true) {
try {
@@ -80,7 +81,7 @@
break;
// 鍐欐暟鎹� 娑叉櫠
case 3:
- write7((List<LedCommand>)task.getData());
+ error((String)task.getData());
break;
// 澶嶄綅 娑叉櫠
case 4:
@@ -92,6 +93,8 @@
case 6:
errorReset();
break;
+ case 7:
+ write7((List<LedCommand>) task.getData());
default:
break;
}
@@ -143,7 +146,7 @@
area.addPage(page);
pf.addArea(area);
if (pf.validate() != null) {
- log.info("pf out of range");
+ News.info("pf out of range");
} else {
// 鏇存柊鑺傜洰
screen.writeProgram(pf);
@@ -193,7 +196,7 @@
pf.addArea(area);
// 鏇存柊鑺傜洰
if (pf.validate() != null) {
- log.info("pf out of range");
+ News.info("pf out of range");
} else {
// 鏇存柊鑺傜洰
screen.writeProgram(pf);
@@ -202,6 +205,7 @@
close();
}
private void write7(List<LedCommand> list) {
+
commandList = list;
StringBuilder sb = new StringBuilder();
@@ -242,6 +246,8 @@
@Override
public boolean connect() {
+ String methodName = Thread.currentThread().getStackTrace()[1].getMethodName();
+
boolean connRes = false;
try {
connRes = screen.connect(slave.getIp(),slave.getPort());
@@ -249,19 +255,17 @@
} catch (Exception ignore) {
}
if (connRes) {
- log.info("led杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ News.info(methodName + ":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(methodName + ":led杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
}
return connRes;
}
@Override
public void close() {
- screen.disconnect();
+
}
-
-
public static void main(String[] args) throws Exception {
String strQty = "1234";
@@ -308,7 +312,7 @@
// 鏇存柊鑺傜洰
if (pf.validate() != null) {
System.out.println("pf out of range");
- log.info("pf out of range");
+ News.info("pf out of range");
} else {
// 鏇存柊鑺傜洰
screen.writeProgram(pf);
@@ -318,37 +322,6 @@
// 缁у紑涓庢帶鍒跺櫒涔嬮棿鐨勯摼鎺�
// screen.disconnect();
}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
public static void main1(String[] args) throws Exception {
Bx5GEnv.initial(3000);
--
Gitblit v1.9.1