From 8c43692f8816bb88eb749ee0ecd897923e0a7b4f Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 13 五月 2023 15:14:22 +0800
Subject: [PATCH] yml

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

diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index dd1f8dd..32447ef 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -5,14 +5,15 @@
 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.BarcodeThread;
-import com.zy.core.thread.CrnThread;
-import com.zy.core.thread.DevpThread;
+import com.zy.core.thread.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 
 /**
@@ -27,15 +28,22 @@
     @Autowired
     private MainProcess mainProcess;
 
-
-//    @PostConstruct
-    public void init(){
+    /**
+     * PostConstruct浼氬湪鍔犺浇servlet鐨勬椂鍊欒繍琛屼竴娆�
+     * @throws InterruptedException
+     */
+    @PostConstruct
+    @Async
+    public void init() throws InterruptedException {
+        log.info("鏍稿績鎺у埗灞傚紑濮嬪垵濮嬪寲...............................................");
+        Thread.sleep(2000);
         // 鍒濆鍖栨秷鎭槦鍒�
         initMq();
         // 鍒濆鍖栦笅浣嶆満绾跨▼
         initThread();
         // 寮�濮嬩富娴佺▼杩涚▼
         mainProcess.start();
+        log.info("鏍稿績鎺у埗灞傚凡鍚姩...............................................");
     }
 
     private void initMq(){
@@ -47,40 +55,59 @@
         for (Slave devp : slaveProperties.getDevp()) {
             MessageQueue.init(SlaveType.Devp, devp);
         }
-        // 鍒濆鍖栨潯鐮佹壂鎻忎华mq
-        for (Slave barcode : slaveProperties.getBarcode()) {
-            MessageQueue.init(SlaveType.Barcode, barcode);
-        }
-        // 鍒濆鍖朙ed鐏痬q
-        for (Slave led : slaveProperties.getLed()) {
-            MessageQueue.init(SlaveType.Led, led);
-        }
+//        // 鍒濆鍖栨潯鐮佹壂鎻忎华mq
+//        for (Slave barcode : slaveProperties.getBarcode()) {
+//            MessageQueue.init(SlaveType.Barcode, barcode);
+//        }
+//        // 鍒濆鍖朙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 car : slaveProperties.getCar()) {
+//            MessageQueue.init(SlaveType.Car, car);
+//        }
     }
 
     private void initThread(){
         // 鍒濆鍖栧爢鍨涙満绾跨▼
+        log.info("鍒濆鍖栧爢鍨涙満绾跨▼...................................................");
         for (CrnSlave crn : slaveProperties.getCrn()) {
-            CrnThread crnThread = new CrnThread(crn);
-            new Thread(crnThread).start();
+            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 DevpThread(devp);
-            new Thread(devpThread).start();
+            DevpThread devpThread = new SiemensDevpThread(devp);
+            new Thread((Runnable) devpThread).start();
             SlaveConnection.put(SlaveType.Devp, devp.getId(), devpThread);
         }
-
-        // 鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼
-        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()) {
+//            LedThread ledThread = new LedThread(led);
+//            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);
         }
     }
 

--
Gitblit v1.9.1