From fb5b2e35fd234d8f8068c690df1bcbf956e05880 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期二, 03 十一月 2020 09:35:28 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 6ecf80a..3e034da 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -3,11 +3,13 @@
 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.properties.SlaveProperties;
-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;
@@ -22,14 +24,22 @@
 
     @Autowired
     private SlaveProperties slaveProperties;
+    @Autowired
+    private MainProcess mainProcess;
 
 
     @PostConstruct
-    public void init(){
+    @Async
+    public void init() throws InterruptedException {
+        log.info("鏍稿績鎺у埗灞傚紑濮嬪垵濮嬪寲...............................................");
+        Thread.sleep(2000);
         // 鍒濆鍖栨秷鎭槦鍒�
         initMq();
         // 鍒濆鍖栦笅浣嶆満绾跨▼
         initThread();
+        // 寮�濮嬩富娴佺▼杩涚▼
+        mainProcess.start();
+        log.info("鏍稿績鎺у埗灞傚凡鍚姩...............................................");
     }
 
     private void initMq(){
@@ -53,23 +63,60 @@
         for (Slave scale : slaveProperties.getScale()) {
             MessageQueue.init(SlaveType.Scale, scale);
         }
+        // 鍒濆鍖栧彴杞q
+        for (Slave car : slaveProperties.getCar()) {
+            MessageQueue.init(SlaveType.Car, car);
+        }
     }
 
     private void initThread(){
         // 鍒濆鍖栧爢鍨涙満绾跨▼
-        for (Slave crn : slaveProperties.getCrn()) {
-            CrnThread crnThread = new CrnThread(crn);
-            new Thread(crnThread).start();
+        log.info("鍒濆鍖栧爢鍨涙満绾跨▼...................................................");
+        for (CrnSlave crn : slaveProperties.getCrn()) {
+            CrnThread crnThread = null;
+            switch (crn.getId()) {
+                case 1:
+                    crnThread = new SiemensCrnThread(crn);
+                    break;
+                case 2:
+                    crnThread = new MelsecCrnThread(crn);
+                    break;
+                default:
+                    break;
+            }
+            new Thread((Runnable) crnThread).start();
             SlaveConnection.put(SlaveType.Crn, crn.getId(), crnThread);
         }
 
-        // 鍒濆鍖栫珯鐐圭嚎绋�
-        for (Slave devp : slaveProperties.getDevp()) {
+        // 鍒濆鍖栬緭閫佺嚎绾跨▼
+        log.info("鍒濆鍖栬緭閫佺嚎绾跨▼...................................................");
+        for (DevpSlave devp : slaveProperties.getDevp()) {
             DevpThread devpThread = new DevpThread(devp);
             new Thread(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);
+        }
+        // 鍒濆鍖朙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 car : slaveProperties.getCar()) {
+            CarThread carThread = new CarThread(car);
+            new Thread(carThread).start();
+            SlaveConnection.put(SlaveType.Car, car.getId(), carThread);
+        }
     }
 
 

--
Gitblit v1.9.1