From c97e67b2b569bf9845acbe6a088b7a2b0f8d6a11 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 05 八月 2025 09:22:15 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/ServerBootstrap.java | 97 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 79 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 5420fbd..7f8e82d 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -1,22 +1,33 @@
package com.zy.core;
+import com.alibaba.fastjson.JSON;
+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.service.BasLiftService;
+import com.zy.asrs.service.DeviceConfigService;
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.task.ShuttleExecuteScheduler;
+import com.zy.core.thread.TrafficControlThread;
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;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
+import java.util.ArrayList;
+import java.util.List;
/**
* Created by vincent on 2020/8/4
@@ -25,13 +36,21 @@
@Component
public class ServerBootstrap {
- @Autowired
- private SlaveProperties slaveProperties;
+ @Value("${deviceExecuteConfig.threadControlCount}")
+ private int threadControlCount;
+
@Autowired
private MainProcess mainProcess;
@Autowired
private RedisUtil redisUtil;
-
+ @Autowired
+ private DeviceConfigService deviceConfigService;
+ @Autowired
+ private ShuttleAction shuttleAction;
+ @Autowired
+ private DeviceMsgUtils deviceMsgUtils;
+ @Autowired
+ private BasLiftService basLiftService;
@PostConstruct
@Async
@@ -49,43 +68,85 @@
private void initMq(){
// 鍒濆鍖栬揣鍙夋彁鍗囨満mq
- for (Slave forkLift : slaveProperties.getForkLift()) {
- MessageQueue.init(SlaveType.ForkLift, forkLift);
+ List<DeviceConfig> forkLiftList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+ .eq("device_type", String.valueOf(SlaveType.ForkLift)));
+ for (DeviceConfig forkLift : forkLiftList) {
+ MessageQueue.init(SlaveType.ForkLift, forkLift.getDeviceNo());
}
// 鍒濆鍖栧洓鍚戠┛姊溅mq
- for (Slave shuttle : slaveProperties.getShuttle()) {
- MessageQueue.init(SlaveType.Shuttle, shuttle);
+ List<DeviceConfig> shuttleList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+ .eq("device_type", String.valueOf(SlaveType.Shuttle)));
+ for (DeviceConfig shuttle : shuttleList) {
+ MessageQueue.init(SlaveType.Shuttle, shuttle.getDeviceNo());
}
+
+ MessageQueue.init(SlaveType.TrafficControl, 1);
}
private void initThread(){
+ List<DeviceConfig> allDevices = new ArrayList<>();
+ List<DeviceConfig> fakeDevices = new ArrayList<>();
+
// 鍒濆鍖栬揣鍙夋彁鍗囨満
News.info("鍒濆鍖栬揣鍙夋彁鍗囨満........................................................");
- for (ForkLiftSlave forkLiftSlave : slaveProperties.getForkLift()) {
+ 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("鏈厤缃揣鍙夋彁鍗囨満鏁版嵁");
+ }
+
ThreadHandler thread = null;
- if (forkLiftSlave.getThreadImpl().equals("ZyForkLiftThread")) {
- thread = new ZyForkLiftThread(forkLiftSlave, redisUtil);
+ if (deviceConfig.getThreadImpl().equals("ZyForkLiftThread")) {
+ thread = new ZyForkLiftThread(deviceConfig, basLift.getStationList$(), redisUtil);
} else {
throw new CoolException("鏈煡鐨勭嚎绋嬪疄鐜�");
}
new Thread(thread).start();
- SlaveConnection.put(SlaveType.ForkLift, forkLiftSlave.getId(), thread);
+ SlaveConnection.put(SlaveType.ForkLift, deviceConfig.getDeviceNo(), thread);
+
+ if (deviceConfig.getFake() == 1) {
+ fakeDevices.add(deviceConfig);
+ }else {
+ allDevices.add(deviceConfig);
+ }
}
// 鍒濆鍖栧洓鍚戠┛姊溅
News.info("鍒濆鍖栧洓鍚戠┛姊溅......................................................");
- for (ShuttleSlave shuttleSlave : slaveProperties.getShuttle()) {
+ List<DeviceConfig> shuttleList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+ .eq("device_type", String.valueOf(SlaveType.Shuttle)));
+ for (DeviceConfig deviceConfig : shuttleList) {
ThreadHandler thread = null;
- if (shuttleSlave.getThreadImpl().equals("NyShuttleThread")) {
- thread = new NyShuttleThread(shuttleSlave, redisUtil);
+ if (deviceConfig.getThreadImpl().equals("NyShuttleThread")) {
+ thread = new NyShuttleThread(deviceConfig, redisUtil);
} else {
throw new CoolException("鏈煡鐨勭嚎绋嬪疄鐜�");
}
new Thread(thread).start();
- SlaveConnection.put(SlaveType.Shuttle, shuttleSlave.getId(), thread);
+ 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