From 13b1c4ff3d3681e32580c224d87dcb0ef362188b Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期二, 06 五月 2025 17:27:16 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/ServerBootstrap.java | 34 +++++++++++++++++++++++-----------
1 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 4876375..2f2a2f4 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -6,6 +6,7 @@
import com.zy.core.model.CrnSlave;
import com.zy.core.model.DevpSlave;
import com.zy.core.model.LedSlave;
+import com.zy.core.model.RgvSlave;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.*;
import lombok.extern.slf4j.Slf4j;
@@ -55,10 +56,14 @@
for (Slave devp : slaveProperties.getDevp()) {
MessageQueue.init(SlaveType.Devp, devp);
}
-// // 鍒濆鍖栨潯鐮佹壂鎻忎华mq
-// for (Slave barcode : slaveProperties.getBarcode()) {
-// MessageQueue.init(SlaveType.Barcode, barcode);
-// }
+ // 鍒濆鍖栨潯鐮佹壂鎻忎华mq
+ for (Slave barcode : slaveProperties.getBarcode()) {
+ MessageQueue.init(SlaveType.Barcode, barcode);
+ }
+ // 鍒濆鍖朢gv mq
+ for (Slave rgv : slaveProperties.getRgv()) {
+ MessageQueue.init(SlaveType.Rgv, rgv);
+ }
// // 鍒濆鍖朙ed鐏痬q
// for (Slave led : slaveProperties.getLed()) {
// MessageQueue.init(SlaveType.Led, led);
@@ -88,13 +93,20 @@
new Thread((Runnable) devpThread).start();
SlaveConnection.put(SlaveType.Devp, devp.getId(), devpThread);
}
-// // 鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼
-// log.info("鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼...................................................");
-// for (Slave barcode : slaveProperties.getBarcode()) {
-// BarcodeThread barcodeThread = new BarcodeThread(barcode);
-//// new Thread(barcodeThread).start();
-// SlaveConnection.put(SlaveType.Barcode, barcode.getId(), barcodeThread);
-// }
+ // 鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼
+ log.info("鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼...................................................");
+ for (Slave barcode : slaveProperties.getBarcode()) {
+ BarcodeThread barcodeThread = new BarcodeThread(barcode);
+// new Thread(barcodeThread).start();
+ SlaveConnection.put(SlaveType.Barcode, barcode.getId(), barcodeThread);
+ }
+ // 鍒濆鍖栫┛姊溅绾跨▼
+ log.info("鍒濆鍖朢GV绾跨▼...................................................");
+ for (RgvSlave rgv : slaveProperties.getRgv()) {
+ RgvThread rgvThread = new RgvThread(rgv);
+ new Thread((Runnable) rgvThread).start();
+ SlaveConnection.put(SlaveType.Rgv, rgv.getId(), rgvThread);
+ }
// // 鍒濆鍖朙ED绾跨▼
// log.info("鍒濆鍖朙ED绾跨▼...................................................");
// for (LedSlave led : slaveProperties.getLed()) {
--
Gitblit v1.9.1