From 973e04d0ab5dda92a0014bdaf1150b86abde398e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 06 八月 2025 16:35:21 +0800
Subject: [PATCH] 修改实现逻辑
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_93_A3_Up.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_93_A3_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_93_A3_Up.java
index bcdd33a..66a3ae9 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_93_A3_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_93_A3_Up.java
@@ -4,12 +4,14 @@
import com.dy.common.mw.protocol.*;
import com.dy.common.mw.protocol.p206V202404.*;
import com.dy.common.mw.protocol.p206V202404.parse.global.GlParse;
-import com.dy.common.mw.protocol.p206V202404.upVos.DataCd93_A3Vo;
+import com.dy.common.mw.protocol.p206V202404.upVos.DataCd93_9D_A3Vo;
+import com.dy.common.mw.protocol.rtuState.ValveStateInfo;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@AnnotationCodeUp(ifAny={
CodeV202404.cd_93,
+ CodeV202404.cd_9D,
CodeV202404.cd_A3
})
@SuppressWarnings("unused")
@@ -23,7 +25,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,
@@ -34,6 +36,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 ;//涓婅鏁版嵁鍗佸叚杩涘埗褰㈠紡
@@ -42,7 +45,13 @@
midRs.reportOrResponse_trueOrFalse = false ;
- callback.callback(midRs.reportOrResponse_trueOrFalse);
+ callback.callback(midRs.reportOrResponse_trueOrFalse, para.data.subData==null?null:((DataV202404)(para.data.subData)).subData);
+ if(para.data != null && para.data.getSubData() != null){
+ DataCd93_9D_A3Vo subData = (DataCd93_9D_A3Vo)((DataV202404)para.data.getSubData()).subData ;
+ //opResult ;//鍏虫车/闃�缁撴灉: 0x00:鎴愬姛 0x81:澶辫触
+ callback.notify(new ValveStateInfo(subData.clResult.byteValue()==0?false:true));
+ }
+
return new MidResult[]{midRs} ;
}
/**
@@ -54,9 +63,9 @@
* @throws Exception 寮傚父
*/
protected void doParse(byte[] bs, int bsLen, String dataCode, Data data) throws Exception {
- DataV202404 dV1 = (DataV202404)data.getSubData() ;
- DataCd93_A3Vo cdData = new DataCd93_A3Vo(CodeV202404.getCodeName(dataCode)) ;
- dV1.subData = cdData ;
+ DataV202404 dV202404 = (DataV202404)data.getSubData() ;
+ DataCd93_9D_A3Vo cdData = new DataCd93_9D_A3Vo(CodeV202404.getCodeName(dataCode)) ;
+ dV202404.subData = cdData ;
GlParse.parseCd93A3(bs, cdData) ;
}
--
Gitblit v1.8.0