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-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_C0_Up.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_C0_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_C0_Up.java index 7a1545d..81feb24 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_C0_Up.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_C0_Up.java @@ -76,7 +76,7 @@ confirmCommand.isQuickSend = true ; } - callback.callback(midRs.reportOrResponse_trueOrFalse); + callback.callback(midRs.reportOrResponse_trueOrFalse, para.data.subData==null?null:((DataV1)(para.data.subData)).subData); if(para.data != null && para.data.getSubData() != null){ DataCdC0Vo cdData = (DataCdC0Vo)((DataV1)para.data.getSubData()).subData ; if(cdData.stateVo != null && cdData.stateVo.valveState != null){ @@ -84,7 +84,7 @@ } } - return new MidResult[]{midRs, confirmCommand} ; + return new MidResult[]{confirmCommand, midRs} ; } /** * 鎵ц鍒嗘瀽 -- Gitblit v1.8.0