From 14d7f0df63340ede75458c0e91b902376ef4dd64 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期三, 20 十一月 2024 11:26:32 +0800 Subject: [PATCH] 1、优化代码;2、修改长级测试中发现的bug;3、通信中间件配置文件配置项修改 --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_83_Up.java | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_83_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_83_Up.java index 75ca70d..dd3e55f 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_83_Up.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_83_Up.java @@ -3,7 +3,6 @@ import com.dy.common.mw.protocol.*; import com.dy.common.mw.protocol.p206V1.*; import com.dy.common.mw.protocol.p206V1.parse.global.GlParse; -import com.dy.common.mw.protocol.p206V1.upVos.DataCd81Vo; import com.dy.common.mw.protocol.p206V1.upVos.DataCd83CloseVo; import com.dy.common.mw.protocol.p206V1.upVos.DataCd83OpenVo; import com.dy.common.mw.protocol.rtuState.ValveStateInfo; @@ -25,7 +24,7 @@ @Override public MidResult[] parse(Boolean isLowPower, CodeParseParams params, CodeParseCallback callback)throws Exception { ParseParamsForUpV1 para = (ParseParamsForUpV1)params ; - int bsLen = new CommonV1().parseDataLen(para.upBuffer) ; + int bsLen = new CommonV1().parseDataLen4P206(para.upBuffer) ; if(bsLen > 0){ this.doParse(para.upBuffer, bsLen, @@ -87,7 +86,7 @@ } callback.callback(midRs.reportOrResponse_trueOrFalse); - return new MidResult[]{midRs, confirmCommand} ; + return new MidResult[]{confirmCommand, midRs} ; } /** * 鎵ц鍒嗘瀽 @@ -223,7 +222,7 @@ Data data = new Data() ; data.setSubData(new DataV1()) ; - int bsLen = new CommonV1().parseDataLen(bs) ; + int bsLen = new CommonV1().parseDataLen4P206(bs) ; if(bsLen > 0){ try { obj.doParse(bs, -- Gitblit v1.8.0