From 3d2a161ca245484a3162b439cadf348b2f3a75fa Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期三, 23 四月 2025 15:06:37 +0800
Subject: [PATCH] 初始化

---
 src/main/java/com/zy/core/ServerBootstrap.java |   50 ++++++++++++++++++++++++++++++++++----------------
 1 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 26d14a9..dddcf0c 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -5,9 +5,12 @@
 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.SocketSlave;
 import com.zy.core.properties.SlaveProperties;
-import com.zy.core.thread.*;
+import com.zy.core.thread.BarcodeThread;
+import com.zy.core.thread.SiemensCrnThread;
+import com.zy.core.thread.SiemensDevpThread;
+import com.zy.core.thread.SocketThread;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
@@ -28,7 +31,10 @@
     @Autowired
     private MainProcess mainProcess;
 
-
+    /**
+     * PostConstruct浼氬湪鍔犺浇servlet鐨勬椂鍊欒繍琛屼竴娆�
+     * @throws InterruptedException
+     */
     @PostConstruct
     @Async
     public void init() throws InterruptedException {
@@ -68,6 +74,10 @@
         for (Slave car : slaveProperties.getCar()) {
             MessageQueue.init(SlaveType.Car, car);
         }
+//        // 鍒濆鍖杝ocket mq
+//        for (Slave socket : slaveProperties.getSocket()) {
+//            MessageQueue.init(SlaveType.Socket, socket);
+//        }
     }
 
     private void initThread(){
@@ -92,20 +102,28 @@
             new Thread(barcodeThread).start();
             SlaveConnection.put(SlaveType.Barcode, barcode.getId(), barcodeThread);
         }
-        // 鍒濆鍖朙ED绾跨▼
-        log.info("鍒濆鍖朙ED绾跨▼...................................................");
-        for (LedSlave led : slaveProperties.getLed()) {
-            LedThread ledThread = new LedThread(led);
-            new Thread(ledThread).start();
-            SlaveConnection.put(SlaveType.Led, led.getId(), ledThread);
-        }
+
+//        // 鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼
+//        log.info("鍒濆鍖朣ocket绾跨▼...................................................");
+//        for (SocketSlave socket : slaveProperties.getSocket()) {
+//            SocketThread socketThread = new SocketThread(socket);
+//            new Thread(socketThread).start();
+//            SlaveConnection.put(SlaveType.Socket, socket.getId(), socketThread);
+//        }
+//        // 鍒濆鍖朙ED绾跨▼
+//        log.info("鍒濆鍖朙ED绾跨▼...................................................");
+//        for (LedSlave led : slaveProperties.getLed()) {
+//            LedThread ledThread = new LedThread(led);
+//            new Thread(ledThread).start();
+//            SlaveConnection.put(SlaveType.Led, led.getId(), ledThread);
+//        }
         // 鍒濆鍖栫绉ょ嚎绋�
-        log.info("鍒濆鍖栫绉ょ嚎绋�...................................................");
-        for (Slave scale : slaveProperties.getScale()) {
-            ScaleThread barcodeThread = new ScaleThread(scale);
-            new Thread(barcodeThread).start();
-            SlaveConnection.put(SlaveType.Scale, scale.getId(), barcodeThread);
-        }
+//        log.info("鍒濆鍖栫绉ょ嚎绋�...................................................");
+//        for (Slave scale : slaveProperties.getScale()) {
+//            ScaleThread barcodeThread = new ScaleThread(scale);
+//            new Thread(barcodeThread).start();
+//            SlaveConnection.put(SlaveType.Scale, scale.getId(), barcodeThread);
+//        }
     }
 
 

--
Gitblit v1.9.1