From a37eb3393b65933105a6f23a1713a2b14b835d16 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期五, 23 五月 2025 12:53:27 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/ServerBootstrap.java | 100 ++++++++++++++++++++-----------------------------
1 files changed, 41 insertions(+), 59 deletions(-)
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 5f00670..c5c91c0 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -1,5 +1,6 @@
package com.zy.core;
+import com.core.exception.CoolException;
import com.zy.common.utils.RedisUtil;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.SlaveConnection;
@@ -7,6 +8,8 @@
import com.zy.core.model.*;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.*;
+import com.zy.core.thread.impl.LfdZyForkLiftMasterThread;
+import com.zy.core.thread.impl.LfdZyForkLiftSlaveThread;
import com.zy.core.thread.impl.NyShuttleThread;
import com.zy.core.thread.impl.ZyForkLiftThread;
import lombok.extern.slf4j.Slf4j;
@@ -47,26 +50,6 @@
}
private void initMq(){
- // 鍒濆鍖栬緭閫佺嚎mq
- for (Slave devp : slaveProperties.getDevp()) {
- MessageQueue.init(SlaveType.Devp, devp);
- }
- // 鍒濆鍖栨潯鐮佹壂鎻忎华mq
- for (Slave barcode : slaveProperties.getBarcode()) {
- MessageQueue.init(SlaveType.Barcode, barcode);
- }
- // 鍒濆鍖朙ed鐏痬q
- for (Slave led : slaveProperties.getLed()) {
- MessageQueue.init(SlaveType.Led, led);
- }
- // 鍒濆鍖栫绉癿q
- for (Slave scale : slaveProperties.getScale()) {
- MessageQueue.init(SlaveType.Scale, scale);
- }
- // 鍒濆鍖栧彴杞q
- for (Slave car : slaveProperties.getCar()) {
- MessageQueue.init(SlaveType.Car, car);
- }
// 鍒濆鍖栬揣鍙夋彁鍗囨満mq
for (Slave forkLift : slaveProperties.getForkLift()) {
MessageQueue.init(SlaveType.ForkLift, forkLift);
@@ -78,50 +61,49 @@
}
private void initThread(){
- // 鍒濆鍖栬緭閫佺嚎绾跨▼
- News.info("鍒濆鍖栬緭閫佺嚎绾跨▼...................................................");
- for (DevpSlave devp : slaveProperties.getDevp()) {
- DevpThread devpThread = new SiemensDevpThread(devp);
- 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()) {
- 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);
- if (barcode.getId() >= 11) {
- new Thread(barcodeThread).start();
+ News.info("鍒濆鍖栬揣鍙夋彁鍗囨満........................................................");
+ ThreadHandler thread = null;
+ if (forkLiftSlave.getThreadImpl().equals("ZyForkLiftThread")) {
+ thread = new ZyForkLiftThread(forkLiftSlave, redisUtil);
+ } else if (forkLiftSlave.getThreadImpl().equals("LfdZyForkLiftSlaveThread")) {
+ thread = new LfdZyForkLiftSlaveThread(forkLiftSlave, redisUtil, forkLiftSlave.getMasterId());
+ } else {
+ throw new CoolException("鏈煡鐨勭嚎绋嬪疄鐜�");
}
- SlaveConnection.put(SlaveType.Barcode, barcode.getId(), barcodeThread);
+
+ new Thread(thread).start();
+ SlaveConnection.put(SlaveType.ForkLift, forkLiftSlave.getId(), thread);
}
- // 鍒濆鍖朙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);
+
+ // 鍒濆鍖栬揣鍙夋彁鍗囨満
+ for (ForkLiftSlave forkLiftSlave : slaveProperties.getForkLiftMaster()) {
+ News.info("鍒濆鍖栬揣鍙夋彁鍗囨満Master........................................................");
+ ThreadHandler thread = null;
+ if (forkLiftSlave.getThreadImpl().equals("LfdZyForkLiftMasterThread")) {
+ thread = new LfdZyForkLiftMasterThread(forkLiftSlave, redisUtil);
+ } else {
+ throw new CoolException("鏈煡鐨勭嚎绋嬪疄鐜�");
+ }
+
+ new Thread(thread).start();
+ SlaveConnection.put(SlaveType.ForkLiftMaster, forkLiftSlave.getId(), thread);
}
- // 鍒濆鍖栫绉ょ嚎绋�
-// News.info("鍒濆鍖栫绉ょ嚎绋�...................................................");
-// for (Slave scale : slaveProperties.getScale()) {
-// ScaleThread barcodeThread = new ScaleThread(scale);
-// new Thread(barcodeThread).start();
-// SlaveConnection.put(SlaveType.Scale, scale.getId(), barcodeThread);
-// }
+
+ // 鍒濆鍖栧洓鍚戠┛姊溅
+ for (ShuttleSlave shuttleSlave : slaveProperties.getShuttle()) {
+ News.info("鍒濆鍖栧洓鍚戠┛姊溅......................................................");
+ ThreadHandler thread = null;
+ if (shuttleSlave.getThreadImpl().equals("NyShuttleThread")) {
+ thread = new NyShuttleThread(shuttleSlave, redisUtil);
+ } else {
+ throw new CoolException("鏈煡鐨勭嚎绋嬪疄鐜�");
+ }
+
+ new Thread(thread).start();
+ SlaveConnection.put(SlaveType.Shuttle, shuttleSlave.getId(), thread);
+ }
}
--
Gitblit v1.9.1