From fb50c6c8111fffd16091ce25d5d389ea3fcc560f Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 21 三月 2025 14:44:39 +0800
Subject: [PATCH] 不同协议中的开关阀类型进行兼容
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_84_Up.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_84_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_84_Up.java
index 534a7e7..d8ceccc 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_84_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_84_Up.java
@@ -4,6 +4,7 @@
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.DataCd84Vo;
+import com.dy.common.mw.protocol.rtuState.ValveStateInfo;
import com.dy.common.util.ByteUtil;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -22,7 +23,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,
@@ -33,6 +34,7 @@
MidResultFromRtu midRs = new MidResultFromRtu() ;
midRs.protocolName = para.protocolName ;//鍗忚鍚嶇О
+ midRs.protocolVersion = para.protocolVersion; //鍗忚鐗堟湰鍙�
midRs.rtuAddr = para.rtuAddr ;//Rtu鍦板潃
midRs.upCode = para.upCode ;//涓婅鏁版嵁涓殑鍔熻兘鐮�
midRs.upHex = para.upHex ;//涓婅鏁版嵁鍗佸叚杩涘埗褰㈠紡
@@ -46,6 +48,7 @@
downCpParams.setValue(
null,
ProtocolConstantV206V1.protocolName,
+ para.protocolVersion,
para.rtuAddr,
Command.defaultId,
confirmComCode,
@@ -56,6 +59,7 @@
MidResultToRtu confirmCommand = new MidResultToRtu() ;
confirmCommand.protocolName = para.protocolName ;//鍗忚鍚嶇О
+ confirmCommand.protocolVersion = para.protocolVersion ;//鍗忚鐗堟湰鍙�
confirmCommand.rtuAddr = para.rtuAddr ;//Rtu鍦板潃
confirmCommand.commandId = Command.defaultId ;//鍛戒护ID锛屽彂璧峰懡浠ょ殑瀹㈡埛绔�(web绔�)鐢熸垚锛屼互鍖归厤鍛戒护缁撴灉
confirmCommand.downCode = confirmComCode ;//涓嬭鍛戒护鍔熻兘鐮�;
@@ -72,8 +76,22 @@
confirmCommand.isQuickSend = true ;
}
- 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);
+ if(para.data != null && para.data.getSubData() != null){
+ DataCd84Vo cdData = (DataCd84Vo)((DataV1)para.data.getSubData()).subData ;
+ if(CommonV1.isCloseValveType(cdData.opType)){
+ callback.notify(new ValveStateInfo(false)) ;
+ }else{
+ callback.notify(new ValveStateInfo(true)) ;
+ }
+ /* 浠ヤ笅鍒ゆ柇闃�闂ㄥ紑鍚姩涓庡叧闂�佷笉鍙彇锛屽洜涓哄湪闃�鎵撳紑杩囩▼涓紝宸ヤ綔鎶ヤ腑鐨勯榾鐘舵�佷笉姝ｇ‘锛屼緥濡傚湪寮�鍚繃绋嬩腑闃�闂ㄧ姸鎬佹槸鍏抽棴鎬�
+ if(cdData.stateVo != null && cdData.stateVo.valveState != null){
+ callback.notify(new ValveStateInfo(cdData.stateVo.valveState.byteValue()== 1?false:true));
+ }
+ */
+ }
+
+ return new MidResult[]{confirmCommand, midRs} ;
}
/**
* 鎵ц鍒嗘瀽
--
Gitblit v1.8.0