From 81d9844aab9d1133505c6e74303754e7f2ac0507 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 07 三月 2025 14:02:41 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/ServerBootstrap.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index cad143d..c2faa69 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;
@@ -51,6 +52,10 @@
for (Slave crn : slaveProperties.getCrn()) {
MessageQueue.init(SlaveType.Crn, crn);
}
+ // 鍒濆鍖朢GVmq
+ for (Slave rgv : slaveProperties.getRgv()) {
+ MessageQueue.init(SlaveType.Rgv, rgv);
+ }
// 鍒濆鍖栬緭閫佺嚎mq
for (Slave devp : slaveProperties.getDevp()) {
MessageQueue.init(SlaveType.Devp, devp);
@@ -77,9 +82,15 @@
// 鍒濆鍖栧爢鍨涙満绾跨▼
log.info("鍒濆鍖栧爢鍨涙満绾跨▼...................................................");
for (CrnSlave crn : slaveProperties.getCrn()) {
- CrnThread crnThread = new MelsecCrnThread(crn);
+ CrnThread crnThread = new SiemensCrnThread(crn);
new Thread((Runnable) crnThread).start();
SlaveConnection.put(SlaveType.Crn, crn.getId(), crnThread);
+ }
+ log.info("鍒濆鍖朢GV绾跨▼...................................................");
+ for (RgvSlave rgv : slaveProperties.getRgv()) {
+ RgvThread rgvThread = new ZyRgvThread(rgv);
+ new Thread((Runnable) rgvThread).start();
+ SlaveConnection.put(SlaveType.Rgv, rgv.getId(), rgvThread);
}
// 鍒濆鍖栬緭閫佺嚎绾跨▼
log.info("鍒濆鍖栬緭閫佺嚎绾跨▼...................................................");
@@ -92,9 +103,17 @@
log.info("鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼...................................................");
for (Slave barcode : slaveProperties.getBarcode()) {
BarcodeThread barcodeThread = new BarcodeThread(barcode);
-// new Thread(barcodeThread).start();
+ new Thread(barcodeThread).start();
SlaveConnection.put(SlaveType.Barcode, barcode.getId(), barcodeThread);
}
+// for (Slave barcode : slaveProperties.getBarcode()) {
+// BarcodeThread barcodeThread = new BarcodeThread(barcode);
+// if(barcode.getId() > 6)
+// {//1鍒�6鍙锋壂鐮佸櫒鏁版嵁浠嶱LC涓幏鍙栵紝鏃犻渶start
+// new Thread(barcodeThread).start();
+// }
+// SlaveConnection.put(SlaveType.Barcode, barcode.getId(), barcodeThread);
+// }
// 鍒濆鍖朙ED绾跨▼
log.info("鍒濆鍖朙ED绾跨▼...................................................");
for (LedSlave led : slaveProperties.getLed()) {
--
Gitblit v1.9.1