From 9f7663a33eb83deece65119da5f3711f0af892ee Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期五, 24 一月 2025 13:30:29 +0800 Subject: [PATCH] 通信中间件增加命令数据解析回调,传回功能码数据,当前以实现远程升级功能需求 --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_C2_Up.java | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_C2_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_C2_Up.java index 037cf9c..0116cc3 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_C2_Up.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_C2_Up.java @@ -2,8 +2,6 @@ import com.dy.common.mw.protocol.*; -import com.dy.common.mw.protocol.p206V2.upVos.DataCd83CloseVo; -import com.dy.common.mw.protocol.p206V2.upVos.DataCd83OpenVo; import com.dy.common.mw.protocol.p206V202404.*; import com.dy.common.mw.protocol.p206V202404.parse.global.GlParse; import com.dy.common.mw.protocol.p206V202404.upVos.DataCdC2Vo; @@ -26,7 +24,7 @@ @Override public MidResult[] parse(Boolean isLowPower, CodeParseParams params, CodeParseCallback callback)throws Exception { ParseParamsForUpV202404 para = (ParseParamsForUpV202404)params ; - int bsLen = new CommonV202404().parseDataLen(para.upBuffer) ; + int bsLen = new CommonV202404().parseDataLen4P202404(para.upBuffer) ; if(bsLen > 0){ this.doParse(para.upBuffer, bsLen, @@ -78,7 +76,7 @@ //浣庡姛鑰楁椂锛屽敖蹇彂閫� confirmCommand.isQuickSend = true ; } - callback.callback(midRs.reportOrResponse_trueOrFalse); + callback.callback(midRs.reportOrResponse_trueOrFalse, para.data.subData==null?null:((DataV202404)(para.data.subData)).subData); if(para.data != null && para.data.getSubData() != null){ DataCdC2Vo subData = (DataCdC2Vo)((DataV202404)para.data.getSubData()).subData ; // public Byte opType2 ;//寮�鍚叧闂細0: 寮�鍚� -1:鍏抽棴 @@ -90,7 +88,7 @@ } } - return new MidResult[]{midRs, confirmCommand} ; + return new MidResult[]{confirmCommand, midRs} ; } /** * 鎵ц鍒嗘瀽 -- Gitblit v1.8.0