From 920d87ad2ca03711af3683237efbb8f7ef5f53ea Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 14 七月 2025 07:53:25 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/controller/OpenController.java | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/core/controller/OpenController.java b/src/main/java/com/zy/core/controller/OpenController.java
index 37b025a..a7ec4ea 100644
--- a/src/main/java/com/zy/core/controller/OpenController.java
+++ b/src/main/java/com/zy/core/controller/OpenController.java
@@ -1,9 +1,6 @@
package com.zy.core.controller;
-import com.alibaba.fastjson.JSON;
import com.zy.common.R;
-import com.zy.core.News;
-import com.zy.core.ThreadHandler;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.param.AddFakeDeviceParam;
@@ -33,17 +30,12 @@
List<DeviceConfig> deviceList = new ArrayList<>();
List<DeviceConfig> configList = new ArrayList<>();
- String deviceConfig = deviceMsgUtils.getDeviceConfig();
- if(null != deviceConfig){
- List<DeviceConfig> deviceConfigs = JSON.parseArray(deviceConfig, DeviceConfig.class);
- configList.addAll(deviceConfigs);
- }
- String fakeDeviceConfig = fakeDeviceUtils.getFakeDeviceConfig();
- if(null != fakeDeviceConfig){
- List<DeviceConfig> deviceConfigs = JSON.parseArray(fakeDeviceConfig, DeviceConfig.class);
- configList.addAll(deviceConfigs);
- }
+ List<DeviceConfig> deviceConfigs = deviceMsgUtils.getDeviceConfig();
+ configList.addAll(deviceConfigs);
+
+ List<DeviceConfig> fakeDeviceConfig = fakeDeviceUtils.getFakeDeviceConfig();
+ configList.addAll(fakeDeviceConfig);
for (DeviceConfig config : configList) {
SlaveType slaveType = SlaveType.findInstance(config.getDeviceType());
@@ -57,6 +49,12 @@
continue;
}
deviceList.add(shuttleThread.getDeviceConfig());
+ } else if (slaveType.equals(SlaveType.ForkLift)) {
+ ForkLiftThread forkLiftThread = (ForkLiftThread) SlaveConnection.get(slaveType, config.getDeviceNo());
+ if(forkLiftThread == null){
+ continue;
+ }
+ deviceList.add(forkLiftThread.getDeviceConfig());
}
}
--
Gitblit v1.9.1