From 1556791461f9ae5c4a1d76ace57b44f10522f92b Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期日, 28 四月 2024 09:27:25 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/LedThread.java |   17 +++++++++--------
 1 files changed, 9 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..10ad6b5 100644
--- a/src/main/java/com/zy/core/thread/LedThread.java
+++ b/src/main/java/com/zy/core/thread/LedThread.java
@@ -53,11 +53,11 @@
     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();
-            News.info("led杩炴帴鏋勯�犲櫒閿欒 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+            log.info("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);
@@ -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");
@@ -251,9 +252,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 +311,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