#

Junjie

2025-07-09 b75406f7a322d0baa21b4ec908bf3738b948b0c0

#

 src/main/java/com/zy/core/model/DeviceCommandMsgModel.java

@@ -9,6 +9,8 @@

    private String deviceType;

    private String resultKey;

    private Object command;

}

 src/main/java/com/zy/core/model/DeviceMsgModel.java

@@ -13,4 +13,6 @@

    private String deviceOriginMsg;

    private String resultKey;

}

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

@@ -29,6 +29,7 @@
    private RedisUtil redisUtil;
    private Socket socket;
    private boolean stopThread = false;
    private HashMap<Integer, String> resultKeyMap = new HashMap<Integer, String>();

    public NyShuttleThread(DeviceConfig deviceConfig, RedisUtil redisUtil) {
        this.deviceConfig = deviceConfig;
@@ -93,11 +94,16 @@
                return;
            }

            Object command = deviceCommandMsg.getCommand();
            String command = JSON.toJSONString(deviceCommandMsg.getCommand());
            JSONObject commandObj = JSON.parseObject(command);
            JSONObject request = commandObj.getJSONObject("request");
            JSONObject header = request.getJSONObject("header");
            Integer requestId = header.getInteger("requestId");
            resultKeyMap.put(requestId, deviceCommandMsg.getResultKey());

            // 获取输出流
            OutputStreamWriter writer = new OutputStreamWriter(this.socket.getOutputStream());
            writer.write(JSON.toJSONString(command) + "\r\n");
            writer.write(command + "\r\n");
            writer.flush();
//            System.out.println("Sent message to server: " + JSON.toJSONString(httpCommand));
        }catch (Exception e) {
@@ -135,12 +141,19 @@
            }

            JSONObject result = JSON.parseObject(sb.toString());//得到响应结果集
            JSONObject response = result.getJSONObject("response");
            JSONObject header = response.getJSONObject("header");
            JSONObject body = response.getJSONObject("body");

            String msgType = result.getString("msgType");

//            log.info("收到Server Data: {}", JSON.toJSONString(result));
            if ("responseMsg".equals(msgType)) {
                JSONObject response = result.getJSONObject("response");
                JSONObject body = response.getJSONObject("body");
                if (body.containsKey("workingMode")) {
                Integer responseId = header.getInteger("responseId");
                String resultKey = resultKeyMap.get(responseId);

                String responseType = body.getString("responseType");
                if (responseType.equals("state")) {
                    //read
                    JSONObject data = parseSocketResult(body);

@@ -149,18 +162,30 @@
                    deviceMsgModel.setDeviceMsgType("status");
                    deviceMsgModel.setDeviceMsg(data);
                    deviceMsgModel.setDeviceOriginMsg(sb.toString());
                    deviceMsgModel.setResultKey(resultKey);
                    deviceMsgUtils.sendDeviceMsg(SlaveType.Shuttle, deviceConfig.getDeviceNo(), deviceMsgModel);
                    return;
                }else {
                    log.info("收到Server Command Data: {}", JSON.toJSONString(result));
                    DeviceMsgModel deviceMsgModel = new DeviceMsgModel();
                    deviceMsgModel.setDeviceId(deviceConfig.getDeviceNo());
                    deviceMsgModel.setDeviceMsgType("command");
                    deviceMsgModel.setDeviceMsg(result);
                    deviceMsgModel.setDeviceOriginMsg(sb.toString());
                    deviceMsgModel.setResultKey(resultKey);
                    deviceMsgUtils.sendDeviceMsg(SlaveType.Shuttle, deviceConfig.getDeviceNo(), deviceMsgModel);
                }
            } else if ("requestMsg".equals(msgType)) {
                log.info("收到Server Init Data: {}", JSON.toJSONString(result));
                String requestType = body.getString("requestType");
                if (requestType.equals("init")) {
                    DeviceMsgModel deviceMsgModel = new DeviceMsgModel();
                    deviceMsgModel.setDeviceId(deviceConfig.getDeviceNo());
                    deviceMsgModel.setDeviceMsgType("shuttleInit");
                    deviceMsgModel.setDeviceMsg(result);
                    deviceMsgModel.setDeviceOriginMsg(sb.toString());
                    deviceMsgUtils.sendDeviceMsg(SlaveType.Shuttle, deviceConfig.getDeviceNo(), deviceMsgModel);
                }
            }
            log.info("收到Server Data: {}", JSON.toJSONString(result));

            DeviceMsgModel deviceMsgModel = new DeviceMsgModel();
            deviceMsgModel.setDeviceId(deviceConfig.getDeviceNo());
            deviceMsgModel.setDeviceMsgType("command");
            deviceMsgModel.setDeviceMsg(result);
            deviceMsgModel.setDeviceOriginMsg(sb.toString());
            deviceMsgUtils.sendDeviceMsg(SlaveType.Shuttle, deviceConfig.getDeviceNo(), deviceMsgModel);
        } catch (Exception e) {
//            e.printStackTrace();
        }