From fbc1ee007b2cbf95d33b6950fc95c0b4a34027d6 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 10 七月 2025 15:54:24 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/ServerBootstrap.java | 26 ++++++++++----------------
1 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index c4a6471..9c9ebd6 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -1,6 +1,5 @@
package com.zy.core;
-import com.alibaba.fastjson.JSON;
import com.zy.common.exception.CoolException;
import com.zy.common.utils.RedisUtil;
import com.zy.core.cache.MessageQueue;
@@ -8,11 +7,13 @@
import com.zy.core.enums.SlaveType;
import com.zy.core.properties.DeviceConfig;
import com.zy.core.thread.fake.FakeNyShuttleThread;
+import com.zy.core.thread.fake.FakeZyForkLiftThread;
import com.zy.core.thread.impl.LfdZyForkLiftMasterThread;
import com.zy.core.thread.impl.NyShuttleThread;
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;
@@ -27,6 +28,8 @@
@Component
public class ServerBootstrap {
+ @Value("${deviceMsgConfig.gatewayPort}")
+ private int gatewayPort;
@Autowired
private RedisUtil redisUtil;
@Autowired
@@ -49,13 +52,7 @@
private void initMq(){
// 鍒濆鍖栬澶噈q
- String deviceConfig = deviceMsgUtils.getDeviceConfig();
- if(null == deviceConfig){
- News.error("鍒濆鍖栬澶囨椂鏈娴嬪埌閰嶇疆鏂囦欢...................");
- return;
- }
-
- List<DeviceConfig> deviceConfigs = JSON.parseArray(deviceConfig, DeviceConfig.class);
+ List<DeviceConfig> deviceConfigs = deviceMsgUtils.getDeviceConfig();
for (DeviceConfig device : deviceConfigs) {
SlaveType type = SlaveType.findInstance(device.getDeviceType());
if(null == type){
@@ -66,13 +63,7 @@
}
private void initThread(){
- String deviceConfig = deviceMsgUtils.getDeviceConfig();
- if(null == deviceConfig){
- News.error("鍒濆鍖栬澶囨椂鏈娴嬪埌閰嶇疆鏂囦欢...................");
- return;
- }
-
- List<DeviceConfig> deviceConfigs = JSON.parseArray(deviceConfig, DeviceConfig.class);
+ List<DeviceConfig> deviceConfigs = deviceMsgUtils.getDeviceConfig();
for (DeviceConfig device : deviceConfigs) {
if (device.getDeviceType().equals(String.valueOf(SlaveType.ForkLift))) {
initForkLiftThread(device);
@@ -83,8 +74,11 @@
}
private void initFakeThread(){
- ThreadHandler thread = new FakeNyShuttleThread(redisUtil);
+ ThreadHandler thread = new FakeNyShuttleThread(redisUtil, gatewayPort);
new Thread(thread).start();
+
+ ThreadHandler thread2 = new FakeZyForkLiftThread(redisUtil);
+ new Thread(thread2).start();
}
--
Gitblit v1.9.1