From 877b2519157cea762b1e63e9c57c09614216d684 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 24 七月 2025 19:27:46 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/ServerBootstrap.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 003d514..6af478e 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -11,7 +11,9 @@
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
+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;
@@ -61,14 +63,16 @@
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> 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(){
@@ -128,6 +132,10 @@
//璁惧鍒濆鍖栧畬姣�
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);
}
--
Gitblit v1.9.1