From 84a9e3a9a624526116b42ab15e27ec852eaa7c21 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 27 七月 2023 14:02:41 +0800
Subject: [PATCH] Shuttle Base Data

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

diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index e995d30..781ce85 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -1,13 +1,12 @@
 package com.zy.core;
 
+import com.zy.common.utils.RedisUtil;
 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.model.*;
 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;
@@ -27,26 +26,25 @@
     private SlaveProperties slaveProperties;
     @Autowired
     private MainProcess mainProcess;
+    @Autowired
+    private RedisUtil redisUtil;
 
 
     @PostConstruct
     @Async
-    public void init(){
-        log.info("鏍稿績鎺у埗灞傚紑濮嬪垵濮嬪寲...............................................");
+    public void init() throws InterruptedException {
+        News.info("鏍稿績鎺у埗灞傚紑濮嬪垵濮嬪寲...............................................");
+        Thread.sleep(2000);
         // 鍒濆鍖栨秷鎭槦鍒�
         initMq();
         // 鍒濆鍖栦笅浣嶆満绾跨▼
         initThread();
         // 寮�濮嬩富娴佺▼杩涚▼
         mainProcess.start();
-        log.info("鏍稿績鎺у埗灞傚凡鍚姩...............................................");
+        News.info("鏍稿績鎺у埗灞傚凡鍚姩...............................................");
     }
 
     private void initMq(){
-        // 鍒濆鍖栧爢鍨涙満mq
-        for (Slave crn : slaveProperties.getCrn()) {
-            MessageQueue.init(SlaveType.Crn, crn);
-        }
         // 鍒濆鍖栬緭閫佺嚎mq
         for (Slave devp : slaveProperties.getDevp()) {
             MessageQueue.init(SlaveType.Devp, devp);
@@ -63,30 +61,62 @@
         for (Slave scale : slaveProperties.getScale()) {
             MessageQueue.init(SlaveType.Scale, scale);
         }
+        // 鍒濆鍖栧彴杞q
+        for (Slave car : slaveProperties.getCar()) {
+            MessageQueue.init(SlaveType.Car, car);
+        }
+        // 鍒濆鍖栨彁鍗囨満mq
+        for (Slave lift : slaveProperties.getLift()) {
+            MessageQueue.init(SlaveType.Lift, lift);
+        }
+        // 鍒濆鍖栧洓鍚戠┛姊溅mq
+        for (Slave shuttle : slaveProperties.getShuttle()) {
+            MessageQueue.init(SlaveType.Shuttle, shuttle);
+        }
     }
 
     private void initThread(){
-        // 鍒濆鍖栧爢鍨涙満绾跨▼
-        log.info("鍒濆鍖栧爢鍨涙満绾跨▼...................................................");
-        for (CrnSlave crn : slaveProperties.getCrn()) {
-            CrnThread crnThread = new CrnThread(crn);
-            new Thread(crnThread).start();
-            SlaveConnection.put(SlaveType.Crn, crn.getId(), crnThread);
-        }
-
         // 鍒濆鍖栬緭閫佺嚎绾跨▼
-        log.info("鍒濆鍖栬緭閫佺嚎绾跨▼...................................................");
+        News.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);
+        // 鍒濆鍖栨彁鍗囨満
+        News.info("鍒濆鍖栨彁鍗囨満........................................................");
+        for (LiftSlave liftSlave : slaveProperties.getLift()) {
+            LiftThread liftThread = new LiftThread(liftSlave, redisUtil);
+            new Thread(liftThread).start();
+            SlaveConnection.put(SlaveType.Lift, liftSlave.getId(), liftThread);
+        }
+        // 鍒濆鍖栧洓鍚戠┛姊溅
+        News.info("鍒濆鍖栧洓鍚戠┛姊溅......................................................");
+        for (ShuttleSlave shuttleSlave : slaveProperties.getShuttle()) {
+            NyShuttleThread shuttleThread = new NyShuttleThread(shuttleSlave,redisUtil);
+            new Thread(shuttleThread).start();
+            SlaveConnection.put(SlaveType.Shuttle, shuttleSlave.getId(), shuttleThread);
+        }
+        // 鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼
+        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()) {
+//            ScaleThread barcodeThread = new ScaleThread(scale);
 //            new Thread(barcodeThread).start();
-//            SlaveConnection.put(SlaveType.Barcode, barcode.getId(), barcodeThread);
+//            SlaveConnection.put(SlaveType.Scale, scale.getId(), barcodeThread);
 //        }
     }
 

--
Gitblit v1.9.1