From 8e6aa832606dd0e341e280dd210a51b45fb99bf6 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期日, 29 一月 2023 16:29:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'gitbit/stwcs' into stwcs
---
src/main/java/com/zy/core/thread/LedThread.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/LedThread.java b/src/main/java/com/zy/core/thread/LedThread.java
index e295752..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;
@@ -56,7 +57,7 @@
// 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());
}
}
@@ -145,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);
@@ -195,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);
@@ -245,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());
@@ -252,9 +255,9 @@
} 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;
}
@@ -309,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);
--
Gitblit v1.9.1