From 4dcb51d65dca80b698a091f896eb1de27d7ed4e6 Mon Sep 17 00:00:00 2001 From: LSH Date: 星期六, 21 十月 2023 08:36:29 +0800 Subject: [PATCH] # --- src/main/java/com/zy/core/thread/LedThread.java | 14 ++++++++------ 1 files changed, 8 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 4500737..4d14e25 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"+" - 1"+" - led杩炴帴鏋勯�犲櫒閿欒 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort()); } } @@ -143,7 +144,7 @@ area.addPage(page); pf.addArea(area); if (pf.validate() != null) { - log.info("pf out of range"); + News.info("Led"+" - 2"+" - pf out of range"); } else { // 鏇存柊鑺傜洰 screen.writeProgram(pf); @@ -193,7 +194,7 @@ pf.addArea(area); // 鏇存柊鑺傜洰 if (pf.validate() != null) { - log.info("pf out of range"); + News.info("Led"+" - 3"+" - pf out of range"); } else { // 鏇存柊鑺傜洰 screen.writeProgram(pf); @@ -214,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"); @@ -250,9 +252,9 @@ } catch (Exception ignore) { } if (connRes) { - log.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; } @@ -309,7 +311,7 @@ // 鏇存柊鑺傜洰 if (pf.validate() != null) { System.out.println("pf out of range"); - log.info("pf out of range"); + News.info("Led"+" - 6"+" - pf out of range"); } else { // 鏇存柊鑺傜洰 screen.writeProgram(pf); -- Gitblit v1.9.1