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 | 6 +++---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 2 +-
src/main/resources/application.yml | 7 +++++++
3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 738fa7b..ec5c4dd 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1670,7 +1670,7 @@
}
// 鍛戒护涓嬪彂 -------------------------------------------------------------------------------
if (!commands.isEmpty()) {
- if (led.getId() == 2) {
+ if (led.getId() == 3) {
if (!MessageQueue.offer(SlaveType.Led, led.getId(), new Task(3, commands))) {
News.error(""+mark+" - 2"+" - {}鍙稬ED鍛戒护涓嬪彂澶辫触锛侊紒锛乕ip锛歿}] [port锛歿}]", led.getId(), led.getIp(), led.getPort());
continue;
diff --git a/src/main/java/com/zy/core/thread/LedThread.java b/src/main/java/com/zy/core/thread/LedThread.java
index 4d14e25..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"+" - 1"+" - led杩炴帴鏋勯�犲櫒閿欒 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ log.info("led杩炴帴鏋勯�犲櫒閿欒 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
}
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index f192262..88d947a 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -242,4 +242,11 @@
ip: 10.10.10.105
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 11
+ # LED3
+ led[2]:
+ id: 3
+ ip: 10.10.10.105
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
staArr: 11
\ No newline at end of file
--
Gitblit v1.9.1