From c904f735e0b8a488ef56744c08f8e10258639bce Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 05 六月 2025 15:54:58 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/ServerBootstrap.java |   67 ++++++++++++++++++++++-----------
 1 files changed, 44 insertions(+), 23 deletions(-)

diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 32447ef..69867d6 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;
@@ -55,18 +53,27 @@
         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);
+        }
+
+//        // 鍒濆鍖栨満姊拌噦mq
+//        for (Slave ext : slaveProperties.getExt()) {
+//            MessageQueue.init(SlaveType.Ext, ext);
 //        }
 //        // 鍒濆鍖朙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);
@@ -75,12 +82,12 @@
 
     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()) {
@@ -95,6 +102,20 @@
 ////            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("鍒濆鍖朎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()) {
@@ -102,13 +123,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