#

Junjie

2025-07-14 920d87ad2ca03711af3683237efbb8f7ef5f53ea

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

@@ -18,6 +18,7 @@
import java.io.*;
import java.net.InetAddress;
import java.net.Socket;
import java.net.SocketException;
import java.text.MessageFormat;
import java.util.*;

@@ -106,7 +107,10 @@
            writer.write(command + "\r\n");
            writer.flush();
//            System.out.println("Sent message to server: " + JSON.toJSONString(httpCommand));
        }catch (Exception e) {
        }catch (SocketException e) {
            this.socket = null;
            e.printStackTrace();
        } catch (IOException e) {
            e.printStackTrace();
        }
    }
@@ -140,7 +144,15 @@
                }
            }

            JSONObject result = JSON.parseObject(sb.toString());//得到响应结果集
            JSONObject result = null;
            try {
                result = JSON.parseObject(sb.toString());//得到响应结果集
            }catch (Exception e){}

            if(result == null) {
                return;
            }

            JSONObject response = result.getJSONObject("response");
            JSONObject header = response.getJSONObject("header");
            JSONObject body = response.getJSONObject("body");
@@ -165,7 +177,7 @@
                    deviceMsgModel.setResultKey(resultKey);
                    deviceMsgUtils.sendDeviceMsg(SlaveType.Shuttle, deviceConfig.getDeviceNo(), deviceMsgModel);
                }else {
                    log.info("收到Server Command Data: {}", JSON.toJSONString(result));
                    log.info("收到Rcs Shuttle Command Data: {}", JSON.toJSONString(result));
                    DeviceMsgModel deviceMsgModel = new DeviceMsgModel();
                    deviceMsgModel.setDeviceId(deviceConfig.getDeviceNo());
                    deviceMsgModel.setDeviceMsgType("command");
@@ -175,7 +187,7 @@
                    deviceMsgUtils.sendDeviceMsg(SlaveType.Shuttle, deviceConfig.getDeviceNo(), deviceMsgModel);
                }
            } else if ("requestMsg".equals(msgType)) {
                log.info("收到Server Init Data: {}", JSON.toJSONString(result));
                log.info("收到Shuttle Init Data: {}", JSON.toJSONString(result));
                String requestType = body.getString("requestType");
                if (requestType.equals("init")) {
                    DeviceMsgModel deviceMsgModel = new DeviceMsgModel();
@@ -249,10 +261,56 @@

            InetAddress address = InetAddress.getByName(deviceConfig.getIp());
            if (address.isReachable(10000)) {
                Socket socket = new Socket(deviceConfig.getIp(), deviceConfig.getPort());
                socket.setSoTimeout(10000);
                socket.setKeepAlive(true);
                this.socket = socket;
                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");
                    map.put("deviceConfig", this.deviceConfig);

                    // 获取输出流
                    OutputStreamWriter writer = new OutputStreamWriter(deviceSocket.getOutputStream());
                    writer.write(JSON.toJSONString(map) + "\r\n");
                    writer.flush();

                    // 获取输入流
                    BufferedReader reader = new BufferedReader(new InputStreamReader(deviceSocket.getInputStream()));
                    // 读取服务器的响应
                    StringBuffer sb = new StringBuffer();
                    char[] chars = new char[2048];//缓冲区
                    while (true) {
                        reader.read(chars);
                        String trim = new String(chars);
                        sb.append(trim);
                        if (trim.lastIndexOf("\r\n") != -1) {
                            break;
                        }
                    }

                    JSONObject result = null;
                    try {
                        result = JSON.parseObject(sb.toString());//得到响应结果集
                    }catch (Exception e){}

                    if(result == null) {
                        return false;
                    }

                    if(result.getInteger("deviceNo") != deviceConfig.getDeviceNo()) {
                        return false;
                    }

                    if(!result.getString("status").equals("success")) {
                        return false;
                    }

                    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()));
            }
        } catch (Exception e) {