From 08d8933d3fe66fb83f1e2e7e4038e62b3c5143e1 Mon Sep 17 00:00:00 2001
From: cpT <1@123>
Date: 星期四, 19 六月 2025 11:10:43 +0800
Subject: [PATCH] #改造
---
src/main/java/com/zy/core/ServerBootstrap.java | 56 ++++++++++++++++++++++++++++++++++----------------------
1 files changed, 34 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 4876375..415e931 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,18 +56,22 @@
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);
// }
-// // 鍒濆鍖栫绉癿q
-// for (Slave scale : slaveProperties.getScale()) {
-// MessageQueue.init(SlaveType.Scale, scale);
-// }
+ // 鍒濆鍖栫绉癿q
+ for (Slave scale : slaveProperties.getScale()) {
+ MessageQueue.init(SlaveType.Scale, scale);
+ }
// // 鍒濆鍖栧彴杞q
// for (Slave car : slaveProperties.getCar()) {
// MessageQueue.init(SlaveType.Car, car);
@@ -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()) {
@@ -102,13 +114,13 @@
// new Thread(ledThread).start();
// SlaveConnection.put(SlaveType.Led, led.getId(), ledThread);
// }
-// // 鍒濆鍖栫绉ょ嚎绋�
-// log.info("鍒濆鍖栫绉ょ嚎绋�...................................................");
-// for (Slave scale : slaveProperties.getScale()) {
-// ScaleThread scaleThread = new ScaleThread(scale);
-// new Thread(scaleThread).start();
-// SlaveConnection.put(SlaveType.Scale, scale.getId(), scaleThread);
-// }
+ // 鍒濆鍖栫绉ょ嚎绋�
+ log.info("鍒濆鍖栫绉ょ嚎绋�...................................................");
+ for (Slave scale : slaveProperties.getScale()) {
+ ScaleThread scaleThread = new ScaleThread(scale);
+ new Thread(scaleThread).start();
+ SlaveConnection.put(SlaveType.Scale, scale.getId(), scaleThread);
+ }
}
--
Gitblit v1.9.1