From e6107b0c8721ff8f0a039fc4719f52cf352edbde Mon Sep 17 00:00:00 2001
From: zy <zy@123>
Date: 星期三, 16 七月 2025 11:00:48 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/ServerBootstrap.java | 49 ++++++++++++++++++-------------------------------
1 files changed, 18 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index b2a3c33..9637f0a 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -1,18 +1,19 @@
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;
import com.zy.core.cache.SlaveConnection;
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 com.zy.core.utils.FakeDeviceUtils;
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,12 +28,16 @@
@Component
public class ServerBootstrap {
+ @Value("${deviceMsgConfig.gatewayPort}")
+ private int gatewayPort;
+ @Value("${deviceMsgConfig.enableFakeDeviceThread}")
+ private boolean enableFakeDeviceThread;
+ @Value("${deviceMsgConfig.enableFake}")
+ private boolean enableFake;
@Autowired
private RedisUtil redisUtil;
@Autowired
private DeviceMsgUtils deviceMsgUtils;
- @Autowired
- private FakeDeviceUtils fakeDeviceUtils;
@PostConstruct
@@ -42,22 +47,16 @@
Thread.sleep(2000);
// 鍒濆鍖栨秷鎭槦鍒�
initMq();
- // 鍒濆鍖栦笅浣嶆満绾跨▼
- initThread();
// 鍒濆鍖栬櫄鎷熻澶囩嚎绋�
initFakeThread();
+ // 鍒濆鍖栦笅浣嶆満绾跨▼
+ initThread();
News.info("鏍稿績鎺у埗灞傚凡鍚姩...............................................");
}
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){
@@ -68,13 +67,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);
@@ -85,17 +78,11 @@
}
private void initFakeThread(){
- String fakeDeviceConfig = fakeDeviceUtils.getFakeDeviceConfig();
- if(null != fakeDeviceConfig){
- List<DeviceConfig> deviceConfigs = JSON.parseArray(fakeDeviceConfig, DeviceConfig.class);
- for (DeviceConfig device : deviceConfigs) {
- if (device.getDeviceType().equals(String.valueOf(SlaveType.ForkLift))) {
- initForkLiftThread(device);
- } else if (device.getDeviceType().equals(String.valueOf(SlaveType.Shuttle))) {
- initShuttleThread(device);
- }
- }
- }
+ ThreadHandler thread = new FakeNyShuttleThread(redisUtil, gatewayPort, enableFake, enableFakeDeviceThread);
+ new Thread(thread).start();
+
+ ThreadHandler thread2 = new FakeZyForkLiftThread(redisUtil);
+ new Thread(thread2).start();
}
--
Gitblit v1.9.1