From 3baecf9643d0798383f742bcd6d8ec7835231c4d Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 01 七月 2025 09:30:14 +0800
Subject: [PATCH] 初始化1.0

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

diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 864647e..98c405f 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -5,9 +5,10 @@
 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.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 lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
@@ -27,8 +28,7 @@
     private SlaveProperties slaveProperties;
     @Autowired
     private MainProcess mainProcess;
-    @Autowired
-    private CPMainProcess cpMainProcess;
+
 
     /**
      * PostConstruct浼氬湪鍔犺浇servlet鐨勬椂鍊欒繍琛屼竴娆�
@@ -45,11 +45,11 @@
         initThread();
         // 寮�濮嬩富娴佺▼杩涚▼
         mainProcess.start();
-        cpMainProcess.start();
+
         log.info("鏍稿績鎺у埗灞傚凡鍚姩...............................................");
     }
 
-    private void initMq(){
+    private void initMq() {
         // 鍒濆鍖栧爢鍨涙満mq
         for (Slave crn : slaveProperties.getCrn()) {
             MessageQueue.init(SlaveType.Crn, crn);
@@ -62,10 +62,10 @@
         for (Slave barcode : slaveProperties.getBarcode()) {
             MessageQueue.init(SlaveType.Barcode, barcode);
         }
-//        // 鍒濆鍖朙ed鐏痬q
-//        for (Slave led : slaveProperties.getLed()) {
-//            MessageQueue.init(SlaveType.Led, led);
-//        }
+        // 鍒濆鍖朙ed鐏痬q
+        for (Slave led : slaveProperties.getLed()) {
+            MessageQueue.init(SlaveType.Led, led);
+        }
 //        // 鍒濆鍖栫绉癿q
 //        for (Slave scale : slaveProperties.getScale()) {
 //            MessageQueue.init(SlaveType.Scale, scale);
@@ -76,7 +76,7 @@
 //        }
     }
 
-    private void initThread(){
+    private void initThread() {
         // 鍒濆鍖栧爢鍨涙満绾跨▼
         log.info("鍒濆鍖栧爢鍨涙満绾跨▼...................................................");
         for (CrnSlave crn : slaveProperties.getCrn()) {
@@ -91,13 +91,13 @@
             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("鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼...................................................");
+//        for (Slave barcode : slaveProperties.getBarcode()) {
+//            BarcodeThread barcodeThread = new BarcodeThread(barcode);
+////            new Thread(barcodeThread).start();
+//            SlaveConnection.put(SlaveType.Barcode, barcode.getId(), barcodeThread);
+//        }
 //        // 鍒濆鍖朙ED绾跨▼
 //        log.info("鍒濆鍖朙ED绾跨▼...................................................");
 //        for (LedSlave led : slaveProperties.getLed()) {

--
Gitblit v1.9.1