From 1ff4b70e59b8c9ceb80d0a695d26b4419ed349f1 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 08 一月 2025 09:48:53 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/ServerBootstrap.java | 37 +++++++++++--------------------------
1 files changed, 11 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index f19854c..5f00670 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -7,6 +7,8 @@
import com.zy.core.model.*;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.*;
+import com.zy.core.thread.impl.NyShuttleThread;
+import com.zy.core.thread.impl.ZyForkLiftThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
@@ -41,7 +43,6 @@
initThread();
// 寮�濮嬩富娴佺▼杩涚▼
mainProcess.start();
- mainProcess.agvStart();
News.info("鏍稿績鎺у埗灞傚凡鍚姩...............................................");
}
@@ -49,12 +50,6 @@
// 鍒濆鍖栬緭閫佺嚎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()) {
@@ -72,9 +67,9 @@
for (Slave car : slaveProperties.getCar()) {
MessageQueue.init(SlaveType.Car, car);
}
- // 鍒濆鍖栨彁鍗囨満mq
- for (Slave lift : slaveProperties.getLift()) {
- MessageQueue.init(SlaveType.Lift, lift);
+ // 鍒濆鍖栬揣鍙夋彁鍗囨満mq
+ for (Slave forkLift : slaveProperties.getForkLift()) {
+ MessageQueue.init(SlaveType.ForkLift, forkLift);
}
// 鍒濆鍖栧洓鍚戠┛姊溅mq
for (Slave shuttle : slaveProperties.getShuttle()) {
@@ -90,22 +85,12 @@
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 (ForkLiftSlave forkLiftSlave : slaveProperties.getForkLift()) {
+ ZyForkLiftThread forkLiftThread = new ZyForkLiftThread(forkLiftSlave, redisUtil);
+ new Thread(forkLiftThread).start();
+ SlaveConnection.put(SlaveType.ForkLift, forkLiftSlave.getId(), forkLiftThread);
}
// 鍒濆鍖栧洓鍚戠┛姊溅
News.info("鍒濆鍖栧洓鍚戠┛姊溅......................................................");
--
Gitblit v1.9.1