From 6d5a0535f0d41f3897c51cd5f19a67e42217ddc0 Mon Sep 17 00:00:00 2001
From: lsh <lsh>
Date: 星期四, 16 五月 2024 10:13:46 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/ServerBootstrap.java | 31 ++++++++++++++++++++-----------
1 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index d67d829..69867d6 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -3,10 +3,7 @@
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
-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.model.*;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.*;
import lombok.extern.slf4j.Slf4j;
@@ -64,6 +61,11 @@
for (Slave rgv : slaveProperties.getRgv()) {
MessageQueue.init(SlaveType.Rgv, rgv);
}
+
+// // 鍒濆鍖栨満姊拌噦mq
+// for (Slave ext : slaveProperties.getExt()) {
+// MessageQueue.init(SlaveType.Ext, ext);
+// }
// // 鍒濆鍖朙ed鐏痬q
// for (Slave led : slaveProperties.getLed()) {
// MessageQueue.init(SlaveType.Led, led);
@@ -86,13 +88,13 @@
// new Thread((Runnable) crnThread).start();
// SlaveConnection.put(SlaveType.Crn, crn.getId(), crnThread);
// }
-// // 鍒濆鍖栬緭閫佺嚎绾跨▼
-// 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("鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼...................................................");
// for (Slave barcode : slaveProperties.getBarcode()) {
@@ -107,6 +109,13 @@
new Thread((Runnable) rgvThread).start();
SlaveConnection.put(SlaveType.Rgv, rgv.getId(), rgvThread);
}
+// // 鍒濆鍖栨満姊拌噦绾跨▼
+// log.info("鍒濆鍖朎xt绾跨▼...................................................");
+// for (ExtSlave ext : slaveProperties.getExt()) {
+// MelsecExtThread extThread = new MelsecExtThread(ext);
+// new Thread(extThread).start();
+// SlaveConnection.put(SlaveType.Ext, ext.getId(), extThread);
+// }
// // 鍒濆鍖朙ED绾跨▼
// log.info("鍒濆鍖朙ED绾跨▼...................................................");
// for (LedSlave led : slaveProperties.getLed()) {
--
Gitblit v1.9.1