From 7f3cae29516a35e85e4b6fc02ec655882d4c2538 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 08 五月 2025 11:55:24 +0800
Subject: [PATCH] 1、测控一体阀协议功能码50补充实现； 2、RTU模拟器模拟实现50、91、92功能码上报； 3、remote模块：完善透传命令实现，完善接收通信中间件返回命令结果实现。
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandResultCtrl.java | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandResultCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandResultCtrl.java
index 9f1bb1c..0fa14ab 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandResultCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandResultCtrl.java
@@ -27,20 +27,19 @@
public class CommandResultCtrl extends ComSupport {
@PostMapping(path = "receive", consumes = MediaType.APPLICATION_JSON_VALUE)
public void receive(@RequestBody Data data) {
- JSONObject job_data = (JSONObject) JSON.toJSON(data);
- //String job_dataS = job_data.toJSONString();
- JSONObject job_subData = job_data.getJSONObject("subData").getJSONObject("subData");
+ JSONObject protocolData = data == null ? null : (JSONObject)data.subData ; //鍗忚鏁版嵁
+ JSONObject codeData = protocolData == null ? null : (protocolData.getJSONObject("subData")) ; //鍗忚鍔熻兘鐮佹暟鎹�
JSONObject job_response = new JSONObject();
- job_response.put("data", job_subData);
- job_response.put("commandCode", job_data.getString("code"));
- job_response.put("commandId", job_data.getString("commandId"));
+ job_response.put("data", codeData==null?protocolData:codeData);
+ job_response.put("commandCode", data.code);
+ job_response.put("commandId", data.commandId);
- CompletableFuture<JSONObject> feature = (CompletableFuture<JSONObject>) ComResultWait.get(job_data.getLong("commandId"));
+ CompletableFuture<JSONObject> feature = (CompletableFuture<JSONObject>) ComResultWait.get(Long.parseLong(data.commandId));
if(feature != null) {
feature.complete(job_response);
- }//else{
- // feature.complete(new JSONObject());
- //}
+ }else{
+ //瓒呮椂锛宖eature琚竻闄や簡
+ }
}
}
--
Gitblit v1.8.0