From 24f53bb77f9ac80feb2e62e8ee670be4aa5f3c6e Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期四, 13 二月 2025 11:56:42 +0800 Subject: [PATCH] 1、远程模块remote模块实现: (1、系统启动时向通信中间件注册消息接收者; (2、消息接收者ctr实现(测试阶段); 2、在配置文件增加配置Springboot RestTemplate网络请求超时时长; 3、其他一些测试与优化。 --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_A0_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/p206V1/parse/Cd_A0_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_A0_Up.java index b9c3eac..632aa5d 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_A0_Up.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_A0_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.DataCd99Vo; import com.dy.common.mw.protocol.p206V1.upVos.DataCdA0Vo; import com.dy.common.mw.protocol.rtuState.ValveStateInfo; import org.apache.logging.log4j.LogManager; @@ -28,7 +27,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, @@ -48,7 +47,7 @@ midRs.reportOrResponse_trueOrFalse = false ;//涓诲姩涓婃姤 - 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){ DataCdA0Vo subData = (DataCdA0Vo)((DataV1)para.data.getSubData()).subData ; callback.notify(new ValveStateInfo(subData.success)); -- Gitblit v1.8.0