From ed265ddfb8f08f69af064a9adf65fcbf06289ffe Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期二, 11 二月 2025 14:07:54 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/ServerBootstrap.java | 42 +++++++++++++++++++-----------------------
1 files changed, 19 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 6d94ede..5f00670 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -1,11 +1,14 @@
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.*;
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;
@@ -25,6 +28,8 @@
private SlaveProperties slaveProperties;
@Autowired
private MainProcess mainProcess;
+ @Autowired
+ private RedisUtil redisUtil;
@PostConstruct
@@ -42,10 +47,6 @@
}
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);
@@ -66,9 +67,9 @@
for (Slave car : slaveProperties.getCar()) {
MessageQueue.init(SlaveType.Car, car);
}
- // 鍒濆鍖栫┛姊溅mq
- for (Slave ste : slaveProperties.getSte()) {
- MessageQueue.init(SlaveType.Ste, ste);
+ // 鍒濆鍖栬揣鍙夋彁鍗囨満mq
+ for (Slave forkLift : slaveProperties.getForkLift()) {
+ MessageQueue.init(SlaveType.ForkLift, forkLift);
}
// 鍒濆鍖栧洓鍚戠┛姊溅mq
for (Slave shuttle : slaveProperties.getShuttle()) {
@@ -77,20 +78,6 @@
}
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()) {
@@ -98,10 +85,17 @@
new Thread((Runnable) devpThread).start();
SlaveConnection.put(SlaveType.Devp, devp.getId(), devpThread);
}
+ // 鍒濆鍖栬揣鍙夋彁鍗囨満
+ 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("鍒濆鍖栧洓鍚戠┛姊溅......................................................");
for (ShuttleSlave shuttleSlave : slaveProperties.getShuttle()) {
- ShuttleThread shuttleThread = new ShuttleThread(shuttleSlave);
+ NyShuttleThread shuttleThread = new NyShuttleThread(shuttleSlave,redisUtil);
new Thread(shuttleThread).start();
SlaveConnection.put(SlaveType.Shuttle, shuttleSlave.getId(), shuttleThread);
}
@@ -109,7 +103,9 @@
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