From a2d6371396f74e4fb30a4c79e91c6b371a77d0b5 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 22 十一月 2024 20:54:07 +0800
Subject: [PATCH] #读取地图文件优化

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

diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 151df14..f19854c 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -1,12 +1,10 @@
 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.LedSlave;
-import com.zy.core.model.SteSlave;
+import com.zy.core.model.*;
 import com.zy.core.properties.SlaveProperties;
 import com.zy.core.thread.*;
 import lombok.extern.slf4j.Slf4j;
@@ -28,6 +26,8 @@
     private SlaveProperties slaveProperties;
     @Autowired
     private MainProcess mainProcess;
+    @Autowired
+    private RedisUtil redisUtil;
 
 
     @PostConstruct
@@ -41,17 +41,20 @@
         initThread();
         // 寮�濮嬩富娴佺▼杩涚▼
         mainProcess.start();
+        mainProcess.agvStart();
         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);
+        }
+        for (Slave devp2 : slaveProperties.getDevp2()) {
+            MessageQueue.init(SlaveType.Devp2, devp2);
+        }
+        for (Slave devp3 : slaveProperties.getDevp3()) {
+            MessageQueue.init(SlaveType.Devp3, devp3);
         }
         // 鍒濆鍖栨潯鐮佹壂鎻忎华mq
         for (Slave barcode : slaveProperties.getBarcode()) {
@@ -69,27 +72,17 @@
         for (Slave car : slaveProperties.getCar()) {
             MessageQueue.init(SlaveType.Car, car);
         }
-        // 鍒濆鍖栫┛姊溅mq
-        for (Slave ste : slaveProperties.getSte()) {
-            MessageQueue.init(SlaveType.Ste, ste);
+        // 鍒濆鍖栨彁鍗囨満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(){
-        // 鍒濆鍖栧爢鍨涙満绾跨▼
-        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 (SteSlave ste : slaveProperties.getSte()) {
-            SteThread steThread = new SteThread(ste);
-            new Thread(steThread).start();
-            SlaveConnection.put(SlaveType.Ste, ste.getId(), steThread);
-        }
         // 鍒濆鍖栬緭閫佺嚎绾跨▼
         News.info("鍒濆鍖栬緭閫佺嚎绾跨▼...................................................");
         for (DevpSlave devp : slaveProperties.getDevp()) {
@@ -97,11 +90,37 @@
             new Thread((Runnable) devpThread).start();
             SlaveConnection.put(SlaveType.Devp, devp.getId(), devpThread);
         }
+        for (Devp2Slave devp2 : slaveProperties.getDevp2()) {
+            SiemensDevpThread2 siemensDevpThread2 = new SiemensDevpThread2(devp2);
+            new Thread(siemensDevpThread2).start();
+            SlaveConnection.put(SlaveType.Devp2, devp2.getId(), siemensDevpThread2);
+        }
+        for (Devp2Slave devp3 : slaveProperties.getDevp3()) {
+            SiemensDevpThread3 siemensDevpThread3 = new SiemensDevpThread3(devp3);
+            new Thread(siemensDevpThread3).start();
+            SlaveConnection.put(SlaveType.Devp3, devp3.getId(), siemensDevpThread3);
+        }
+        // 鍒濆鍖栨彁鍗囨満
+        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();
+            if (barcode.getId() >= 11) {
+                new Thread(barcodeThread).start();
+            }
             SlaveConnection.put(SlaveType.Barcode, barcode.getId(), barcodeThread);
         }
         // 鍒濆鍖朙ED绾跨▼

--
Gitblit v1.9.1