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/p206V1/parse/Cd_83_Up.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 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..20f4131 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,
@@ -86,8 +85,8 @@
}
}
- callback.callback(midRs.reportOrResponse_trueOrFalse);
- return new MidResult[]{midRs, confirmCommand} ;
+ callback.callback(midRs.reportOrResponse_trueOrFalse, para.data.subData==null?null:((DataV1)(para.data.subData)).subData);
+ 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