From 7635dc25bd2a4d565df496b2d96354639966768d Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期四, 25 九月 2025 11:09:44 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/ServerBootstrap.java | 146 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 106 insertions(+), 40 deletions(-)
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index f90de2d..096e4f1 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -1,24 +1,31 @@
package com.zy.core;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.exception.CoolException;
+import com.zy.asrs.entity.BasLift;
import com.zy.asrs.entity.DeviceConfig;
+import com.zy.asrs.entity.LocMast;
+import com.zy.asrs.service.BasLiftService;
import com.zy.asrs.service.DeviceConfigService;
+import com.zy.asrs.service.LocMastService;
+import com.zy.asrs.utils.Utils;
import com.zy.common.utils.RedisUtil;
+import com.zy.core.action.ShuttleAction;
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.LfdZyForkLiftMasterThread;
-import com.zy.core.thread.impl.LfdZyForkLiftSlaveThread;
+import com.zy.core.task.ShuttleExecuteScheduler;
+import com.zy.core.thread.TrafficControlThread;
+import com.zy.core.thread.impl.NyLiftThread;
import com.zy.core.thread.impl.NyShuttleThread;
+import com.zy.core.thread.impl.TrafficControlImplThread;
import com.zy.core.thread.impl.ZyForkLiftThread;
import com.zy.core.utils.DeviceMsgUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component;
@@ -34,6 +41,9 @@
@Component
public class ServerBootstrap {
+ @Value("${deviceExecuteConfig.threadControlCount}")
+ private int threadControlCount;
+
@Autowired
private MainProcess mainProcess;
@Autowired
@@ -41,7 +51,13 @@
@Autowired
private DeviceConfigService deviceConfigService;
@Autowired
+ private ShuttleAction shuttleAction;
+ @Autowired
private DeviceMsgUtils deviceMsgUtils;
+ @Autowired
+ private BasLiftService basLiftService;
+ @Autowired
+ private LocMastService locMastService;
@PostConstruct
@Async
@@ -62,58 +78,94 @@
List<DeviceConfig> forkLiftList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
.eq("device_type", String.valueOf(SlaveType.ForkLift)));
for (DeviceConfig forkLift : forkLiftList) {
- MessageQueue.init(SlaveType.ForkLift, forkLift);
+ MessageQueue.init(SlaveType.ForkLift, forkLift.getDeviceNo());
+ }
+ // 鍒濆鍖栨彁鍗囨満mq
+ List<DeviceConfig> liftList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+ .eq("device_type", String.valueOf(SlaveType.Lift)));
+ for (DeviceConfig lift : liftList) {
+ MessageQueue.init(SlaveType.Lift, lift.getDeviceNo());
}
// 鍒濆鍖栧洓鍚戠┛姊溅mq
List<DeviceConfig> shuttleList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
.eq("device_type", String.valueOf(SlaveType.Shuttle)));
for (DeviceConfig shuttle : shuttleList) {
- MessageQueue.init(SlaveType.Shuttle, shuttle);
+ MessageQueue.init(SlaveType.Shuttle, shuttle.getDeviceNo());
}
+
+ MessageQueue.init(SlaveType.TrafficControl, 1);
}
private void initThread(){
List<DeviceConfig> allDevices = new ArrayList<>();
+ List<DeviceConfig> fakeDevices = new ArrayList<>();
-// // 鍒濆鍖栬揣鍙夋彁鍗囨満
-// List<DeviceConfig> forkLiftList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
-// .eq("device_type", String.valueOf(SlaveType.ForkLift)));
-// allDevices.addAll(forkLiftList);
-// for (DeviceConfig deviceConfig : forkLiftList) {
-// News.info("鍒濆鍖栬揣鍙夋彁鍗囨満........................................................");
-// ThreadHandler thread = null;
-// if (deviceConfig.getThreadImpl().equals("ZyForkLiftThread")) {
-// thread = new ZyForkLiftThread(forkLiftSlave, redisUtil);
-// } else if (deviceConfig.getThreadImpl().equals("LfdZyForkLiftSlaveThread")) {
-// thread = new LfdZyForkLiftSlaveThread(forkLiftSlave, redisUtil, forkLiftSlave.getMasterId());
-// } else {
-// throw new CoolException("鏈煡鐨勭嚎绋嬪疄鐜�");
-// }
-//
-// new Thread(thread).start();
-// SlaveConnection.put(SlaveType.ForkLift, deviceConfig.getDeviceNo(), thread);
-// }
+ // 鍒濆鍖栬揣鍙夋彁鍗囨満
+ News.info("鍒濆鍖栬揣鍙夋彁鍗囨満........................................................");
+ List<DeviceConfig> forkLiftList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+ .eq("device_type", String.valueOf(SlaveType.ForkLift)));
+ for (DeviceConfig deviceConfig : forkLiftList) {
+ BasLift basLift = basLiftService.selectOne(new EntityWrapper<BasLift>().eq("lift_no", deviceConfig.getDeviceNo()));
+ if (basLift == null) {
+ throw new CoolException("鏈厤缃揣鍙夋彁鍗囨満鏁版嵁");
+ }
-// // 鍒濆鍖栬揣鍙夋彁鍗囨満
-// 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);
-// }
+ ThreadHandler thread = null;
+ if (deviceConfig.getThreadImpl().equals("ZyForkLiftThread")) {
+ thread = new ZyForkLiftThread(deviceConfig, basLift.getStationList$(), redisUtil);
+ } else {
+ throw new CoolException("鏈煡鐨勭嚎绋嬪疄鐜�");
+ }
+
+ new Thread(thread).start();
+ SlaveConnection.put(SlaveType.ForkLift, deviceConfig.getDeviceNo(), thread);
+
+ if (deviceConfig.getFake() == 1) {
+ fakeDevices.add(deviceConfig);
+ }else {
+ allDevices.add(deviceConfig);
+ }
+ }
+
+ // 鍒濆鍖栨彁鍗囨満
+ News.info("鍒濆鍖栨彁鍗囨満........................................................");
+ List<DeviceConfig> liftList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+ .eq("device_type", String.valueOf(SlaveType.Lift)));
+ for (DeviceConfig deviceConfig : liftList) {
+ BasLift basLift = basLiftService.selectOne(new EntityWrapper<BasLift>().eq("lift_no", deviceConfig.getDeviceNo()));
+ if (basLift == null) {
+ throw new CoolException("鏈厤缃彁鍗囨満鏁版嵁");
+ }
+
+ ThreadHandler thread = null;
+ if (deviceConfig.getThreadImpl().equals("NyLiftThread")) {
+ thread = new NyLiftThread(deviceConfig, basLift.getPoint$(), basLift.getStationList$(), redisUtil);
+ } else {
+ throw new CoolException("鏈煡鐨勭嚎绋嬪疄鐜�");
+ }
+
+ new Thread(thread).start();
+ SlaveConnection.put(SlaveType.Lift, deviceConfig.getDeviceNo(), thread);
+
+ String locNo = Utils.getLocNo(basLift.getPoint$().getRow(), basLift.getPoint$().getBay(), 1);
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locNo));
+ JSONObject point = JSON.parseObject(locMast.getQrCodeValue());
+ if (point == null) {
+ continue;
+ }
+ deviceConfig.setOtherData(point.getInteger("x") + "-" + point.getInteger("y"));
+ if (deviceConfig.getFake() == 1) {
+ fakeDevices.add(deviceConfig);
+ }else {
+ allDevices.add(deviceConfig);
+ }
+ }
// 鍒濆鍖栧洓鍚戠┛姊溅
+ News.info("鍒濆鍖栧洓鍚戠┛姊溅......................................................");
List<DeviceConfig> shuttleList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
.eq("device_type", String.valueOf(SlaveType.Shuttle)));
- allDevices.addAll(shuttleList);
for (DeviceConfig deviceConfig : shuttleList) {
- News.info("鍒濆鍖栧洓鍚戠┛姊溅......................................................");
ThreadHandler thread = null;
if (deviceConfig.getThreadImpl().equals("NyShuttleThread")) {
thread = new NyShuttleThread(deviceConfig, redisUtil);
@@ -123,11 +175,25 @@
new Thread(thread).start();
SlaveConnection.put(SlaveType.Shuttle, deviceConfig.getDeviceNo(), thread);
+
+ if (deviceConfig.getFake() == 1) {
+ fakeDevices.add(deviceConfig);
+ }else {
+ allDevices.add(deviceConfig);
+ }
}
//璁惧鍒濆鍖栧畬姣�
deviceMsgUtils.sendDeviceConfig(JSON.toJSONString(allDevices));
+ deviceMsgUtils.sendFakeDeviceConfig(JSON.toJSONString(fakeDevices));
+
+ TrafficControlThread trafficControlThread = new TrafficControlImplThread(redisUtil);
+ new Thread(trafficControlThread).start();
+ SlaveConnection.put(SlaveType.TrafficControl, 1, trafficControlThread);
+
+ ShuttleExecuteScheduler shuttleExecuteScheduler = new ShuttleExecuteScheduler(shuttleAction, deviceConfigService, redisUtil, threadControlCount);
+ new Thread(shuttleExecuteScheduler).start();
}
--
Gitblit v1.9.1