From 58bb9d3e0a8d8c385085f8cce3492eccf5448ec4 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 10 九月 2025 16:20:12 +0800
Subject: [PATCH] 1

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

diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index c7c8a21..05e4a91 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -12,6 +12,7 @@
 import com.zy.core.thread.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.DependsOn;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
@@ -26,12 +27,13 @@
  */
 @Slf4j
 @Component
+@DependsOn("springContextUtil")
 public class ServerBootstrap {
 
     @Autowired
     private SlaveProperties slaveProperties;
     @Autowired
-    private MainProcess mainProcess;
+    private CtuMainProcess ctuMainProcess;
 
     public static final Map<CrnThread, Thread> map = new ConcurrentHashMap<>();
 
@@ -41,6 +43,7 @@
      */
     @PostConstruct
     @Async
+    @DependsOn("basDevpService")
     public void init() throws InterruptedException {
         News.info("鏍稿績鎺у埗灞傚紑濮嬪垵濮嬪寲...............................................");
         Thread.sleep(2000);
@@ -49,15 +52,15 @@
         // 鍒濆鍖栦笅浣嶆満绾跨▼
         initThread();
         // 寮�濮嬩富娴佺▼杩涚▼
-        mainProcess.start();
+        ctuMainProcess.start();
         News.info("鏍稿績鎺у埗灞傚凡鍚姩...............................................");
     }
 
     private void initMq(){
         // 鍒濆鍖栧爢鍨涙満mq
-        for (Slave crn : slaveProperties.getCrn()) {
-            MessageQueue.init(SlaveType.Crn, crn);
-        }
+//        for (Slave crn : slaveProperties.getCrn()) {
+//            MessageQueue.init(SlaveType.Crn, crn);
+//        }
         // 鍒濆鍖朢gv灏忚溅mq
 //        for (Slave rgv : slaveProperties.getRgv()) {
 //            MessageQueue.init(SlaveType.Rgv, rgv);
@@ -67,13 +70,13 @@
             MessageQueue.init(SlaveType.Devp, devp);
         }
         // 鍒濆鍖栨潯鐮佹壂鎻忎华mq
-        for (Slave barcode : slaveProperties.getBarcode()) {
-            MessageQueue.init(SlaveType.Barcode, barcode);
-        }
+//        for (Slave barcode : slaveProperties.getBarcode()) {
+//            MessageQueue.init(SlaveType.Barcode, barcode);
+//        }
         // 鍒濆鍖朙ed鐏痬q
-        for (Slave led : slaveProperties.getLed()) {
-            MessageQueue.init(SlaveType.Led, led);
-        }
+//        for (Slave led : slaveProperties.getLed()) {
+//            MessageQueue.init(SlaveType.Led, led);
+//        }
         // 鍒濆鍖栫绉癿q
 //        for (Slave scale : slaveProperties.getScale()) {
 //            MessageQueue.init(SlaveType.Scale, scale);
@@ -86,12 +89,12 @@
 
     private void initThread(){
         // 鍒濆鍖栧爢鍨涙満绾跨▼
-        News.info("鍒濆鍖栧爢鍨涙満绾跨▼...................................................");
-        for (CrnSlave crn : slaveProperties.getCrn()) {
-            CrnThread crnThread = new SiemensCrnThread(crn);
-            new Thread((Runnable) crnThread).start();
-            SlaveConnection.put(SlaveType.Crn, crn.getId(), crnThread);
-        }
+//        News.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("鍒濆鍖朢GV绾跨▼...................................................");
 //        for (RgvSlave rgv : slaveProperties.getRgv()) {
@@ -107,19 +110,19 @@
             SlaveConnection.put(SlaveType.Devp, devp.getId(), devpThread);
         }
         // 鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼
-        News.info("鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼...................................................");
-        for (Slave barcode : slaveProperties.getBarcode()) {
-            BarcodeThread barcodeThread = new BarcodeThread(barcode);
-//            new Thread(barcodeThread).start();
-            SlaveConnection.put(SlaveType.Barcode, barcode.getId(), barcodeThread);
-        }
-        // 鍒濆鍖朙ED绾跨▼
-        News.info("鍒濆鍖朙ED绾跨▼...................................................");
-        for (LedSlave led : slaveProperties.getLed()) {
-            LedThread ledThread = new LedThread(led);
-            new Thread(ledThread).start();
-            SlaveConnection.put(SlaveType.Led, led.getId(), ledThread);
-        }
+//        News.info("鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼...................................................");
+//        for (Slave barcode : slaveProperties.getBarcode()) {
+//            BarcodeThread barcodeThread = new BarcodeThread(barcode);
+////            new Thread(barcodeThread).start();
+//            SlaveConnection.put(SlaveType.Barcode, barcode.getId(), barcodeThread);
+//        }
+//        // 鍒濆鍖朙ED绾跨▼
+//        News.info("鍒濆鍖朙ED绾跨▼...................................................");
+//        for (LedSlave led : slaveProperties.getLed()) {
+//            LedThread ledThread = new LedThread(led);
+//            new Thread(ledThread).start();
+//            SlaveConnection.put(SlaveType.Led, led.getId(), ledThread);
+//        }
         // 鍒濆鍖栫绉ょ嚎绋�
 //        News.info("鍒濆鍖栫绉ょ嚎绋�...................................................");
 //        for (Slave scale : slaveProperties.getScale()) {

--
Gitblit v1.9.1