From 7aa5444a36007fc463ef8a4a08ed1bed5bc3bfd3 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 13 一月 2025 13:06:27 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/core/thread/RgvThread.java | 1 +
src/main/resources/application.yml | 14 --------------
src/main/java/com/zy/core/ServerBootstrap.java | 22 +++++++++++-----------
3 files changed, 12 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index c52b3fc..862d803 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -53,10 +53,10 @@
for (Slave rgv : slaveProperties.getRgv()) {
MessageQueue.init(SlaveType.Rgv, rgv);
}
- // 鍒濆鍖栬緭閫佺嚎mq
- for (Slave devp : slaveProperties.getDevp()) {
- MessageQueue.init(SlaveType.Devp, devp);
- }
+// // 鍒濆鍖栬緭閫佺嚎mq
+// for (Slave devp : slaveProperties.getDevp()) {
+// MessageQueue.init(SlaveType.Devp, devp);
+// }
// // 鍒濆鍖栨潯鐮佹壂鎻忎华mq
// for (Slave barcode : slaveProperties.getBarcode()) {
// MessageQueue.init(SlaveType.Barcode, barcode);
@@ -87,13 +87,13 @@
new Thread((Runnable) rgvThread).start();
SlaveConnection.put(SlaveType.Rgv, rgv.getId(), rgvThread);
}
- // 鍒濆鍖栬緭閫佺嚎绾跨▼
- log.info("鍒濆鍖栬緭閫佺嚎绾跨▼...................................................");
- for (DevpSlave devp : slaveProperties.getDevp()) {
- DevpThread devpThread = new SiemensDevpThread(devp);
- new Thread((Runnable) devpThread).start();
- SlaveConnection.put(SlaveType.Devp, devp.getId(), devpThread);
- }
+// // 鍒濆鍖栬緭閫佺嚎绾跨▼
+// log.info("鍒濆鍖栬緭閫佺嚎绾跨▼...................................................");
+// for (DevpSlave devp : slaveProperties.getDevp()) {
+// DevpThread devpThread = new SiemensDevpThread(devp);
+// new Thread((Runnable) devpThread).start();
+// SlaveConnection.put(SlaveType.Devp, devp.getId(), devpThread);
+// }
//
// // 鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼
// log.info("鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼...................................................");
diff --git a/src/main/java/com/zy/core/thread/RgvThread.java b/src/main/java/com/zy/core/thread/RgvThread.java
index 5323b82..39c6825 100644
--- a/src/main/java/com/zy/core/thread/RgvThread.java
+++ b/src/main/java/com/zy/core/thread/RgvThread.java
@@ -105,6 +105,7 @@
if (null == rgvProtocol) {
rgvProtocol = new RgvProtocol();
}
+ rgvProtocol.setRgvNo(slave.getId());
rgvProtocol.setMode((short) -1);
rgvProtocol.setStatus((short)-1);
rgvProtocol.setTaskNo1((short)0);
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 8d175f6..f068d4f 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -46,20 +46,6 @@
# 涓嬩綅鏈洪厤缃�
wcs-slave:
- # 杈撻�佺嚎
- devp[0]:
- id: 1
- ip: 192.168.4.250
- port: 502
- rack: 0
- slot: 0
- # 杈撻�佺嚎
- devp[1]:
- id: 2
- ip: 192.168.4.250
- port: 502
- rack: 0
- slot: 0
# RGV绌挎杞�1
rgv[0]:
id: 1
--
Gitblit v1.9.1