#

zy

2025-07-14 c7f699711682ff7a99d4304f35d12d49e25235cc

 src/main/java/com/zy/core/thread/impl/NyShuttleThread.java

@@ -6,6 +6,7 @@
import com.zy.common.utils.DateUtils;
import com.zy.common.utils.RedisUtil;
import com.zy.core.News;
import com.zy.core.enums.RedisKeyType;
import com.zy.core.model.DeviceCommandMsgModel;
import com.zy.core.model.DeviceMsgModel;
import com.zy.core.properties.DeviceConfig;
@@ -13,6 +14,7 @@
import com.zy.core.cache.OutputQueue;
import com.zy.core.enums.SlaveType;
import com.zy.core.thread.ShuttleThread;
import com.zy.core.utils.FakeDeviceUtils;
import lombok.extern.slf4j.Slf4j;

import java.io.*;
@@ -270,13 +272,44 @@
                return true;
            }

            if(this.deviceConfig.getFake()) {
                return fakeConnect();
            }else {
                InetAddress address = InetAddress.getByName(deviceConfig.getIp());
                if (address.isReachable(10000)) {
                    Socket deviceSocket = new Socket(deviceConfig.getIp(), deviceConfig.getPort());
                    deviceSocket.setSoTimeout(10000);
                    deviceSocket.setKeepAlive(true);
                    this.socket = deviceSocket;
                    log.info(MessageFormat.format("【{0}】四向穿梭车Socket链接成功 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), deviceConfig.getDeviceNo(), deviceConfig.getIp(), deviceConfig.getPort()));
                }
            }
        } catch (Exception e) {
            OutputQueue.SHUTTLE.offer(MessageFormat.format("【{0}】四向穿梭车Socket链接失败 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), deviceConfig.getDeviceNo(), deviceConfig.getIp(), deviceConfig.getPort()));
            return false;
        }

        return true;
    }

    private boolean fakeConnect() {
        try {
            FakeDeviceUtils fakeDeviceUtils = SpringUtils.getBean(FakeDeviceUtils.class);
            if(fakeDeviceUtils == null) {
                return false;
            }

            boolean applyResult = fakeDeviceUtils.applyShuttleConnect(deviceConfig.getDeviceNo());
            if(!applyResult) {
                return false;
            }

            InetAddress address = InetAddress.getByName(deviceConfig.getIp());
            if (address.isReachable(10000)) {
                Socket deviceSocket = new Socket(deviceConfig.getIp(), deviceConfig.getPort());
                deviceSocket.setSoTimeout(10000);
                deviceSocket.setKeepAlive(true);

                if (this.deviceConfig.getFake()) {
                    //虚拟设备需要上报设备信息
                    HashMap<String, Object> map = new HashMap<>();
                    map.put("msgType", "fakeDeviceFirstConnect");
@@ -319,17 +352,14 @@
                    }

                    this.socket = deviceSocket;
                }else {
                    this.socket = deviceSocket;
                }

                log.info(MessageFormat.format("【{0}】四向穿梭车Socket链接成功 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), deviceConfig.getDeviceNo(), deviceConfig.getIp(), deviceConfig.getPort()));
                return true;
            }
        } catch (Exception e) {
            OutputQueue.SHUTTLE.offer(MessageFormat.format("【{0}】四向穿梭车Socket链接失败 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), deviceConfig.getDeviceNo(), deviceConfig.getIp(), deviceConfig.getPort()));
            return false;
            e.printStackTrace();
        }

        return true;
        return false;
    }

    @Override