From e2c28bc98587c6edd6a38f06b972ff51d998028f Mon Sep 17 00:00:00 2001 From: wuzeyu <1223318623@qq.com> Date: 星期三, 27 十一月 2024 08:52:05 +0800 Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_83_Up.java | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_83_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_83_Up.java index 2bb9721..bd18237 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_83_Up.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_83_Up.java @@ -4,7 +4,6 @@ import com.dy.common.mw.protocol.*; import com.dy.common.mw.protocol.p206V202404.*; import com.dy.common.mw.protocol.p206V202404.upVos.DataCd83Vo; -import com.dy.common.mw.protocol.rtuState.ValveStateInfo; import com.dy.common.util.ByteUtil; import com.dy.common.util.DateTime; import org.apache.logging.log4j.LogManager; @@ -24,7 +23,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, @@ -79,7 +78,7 @@ } callback.callback(midRs.reportOrResponse_trueOrFalse); - return new MidResult[]{midRs, confirmCommand} ; + return new MidResult[]{confirmCommand, midRs} ; } /** * 鎵ц鍒嗘瀽 -- Gitblit v1.8.0