From c80d68ee7d5ceb5f93289220a410737da3a7bf9f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 23 四月 2024 08:44:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ssdwcs' into ssdwcs
---
src/main/java/com/zy/core/ServerBootstrap.java | 59 ++++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 38 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 415ce12..c8fe405 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -3,9 +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.*;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.*;
import lombok.extern.slf4j.Slf4j;
@@ -63,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);
@@ -79,25 +82,39 @@
private void initThread(){
// 鍒濆鍖栧爢鍨涙満绾跨▼
- log.info("鍒濆鍖栧爢鍨涙満绾跨▼...................................................");
- for (CrnSlave crn : slaveProperties.getCrn()) {
- CrnThread crnThread = new SiemensCrnThread(crn);
- new Thread((Runnable) crnThread).start();
- SlaveConnection.put(SlaveType.Crn, crn.getId(), crnThread);
+// log.info("鍒濆鍖栧爢鍨涙満绾跨▼...................................................");
+// for (CrnSlave crn : slaveProperties.getCrn()) {
+// CrnThread crnThread = new SiemensCrnThread(crn);
+// 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 (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 SiemensRgvThread(rgv);
+ 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 (Slave barcode : slaveProperties.getBarcode()) {
- BarcodeThread barcodeThread = new BarcodeThread(barcode);
-// new Thread(barcodeThread).start();
- SlaveConnection.put(SlaveType.Barcode, barcode.getId(), barcodeThread);
+ // 鍒濆鍖栨満姊拌噦绾跨▼
+ 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绾跨▼...................................................");
--
Gitblit v1.9.1