From b75406f7a322d0baa21b4ec908bf3738b948b0c0 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 09 七月 2025 15:49:28 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/impl/NyShuttleThread.java | 53 +++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 39 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java b/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
index 6737009..9a9aa99 100644
--- a/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
+++ b/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,13 +141,19 @@
}
JSONObject result = JSON.parseObject(sb.toString());//寰楀埌鍝嶅簲缁撴灉闆�
- log.info("鏀跺埌Server Data: {}", JSON.toJSONString(result));
+ 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);
@@ -150,17 +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);
}
}
-
- 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();
}
--
Gitblit v1.9.1