#

Junjie

2025-07-09 b75406f7a322d0baa21b4ec908bf3738b948b0c0

 src/main/java/com/zy/core/controller/OpenController.java

@@ -1,15 +1,11 @@
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;
import com.zy.core.model.param.DeleteDeviceParam;
import com.zy.core.properties.DeviceConfig;
import com.zy.core.thread.ForkLiftThread;
import com.zy.core.thread.ShuttleThread;
import com.zy.core.utils.DeviceMsgUtils;
import com.zy.core.utils.FakeDeviceUtils;
@@ -33,17 +29,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());