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/p206V202404/parse/Cd_C2_Up.java | 46 ++++++++++++++++++++++++++++++++++++++--------
1 files changed, 38 insertions(+), 8 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_C2_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_C2_Up.java
index f15eed4..0116cc3 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_C2_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_C2_Up.java
@@ -3,8 +3,9 @@
import com.dy.common.mw.protocol.*;
import com.dy.common.mw.protocol.p206V202404.*;
-import com.dy.common.mw.protocol.p206V202404.upVos.DataCd02Vo;
+import com.dy.common.mw.protocol.p206V202404.parse.global.GlParse;
import com.dy.common.mw.protocol.p206V202404.upVos.DataCdC2Vo;
+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;
@@ -23,17 +24,18 @@
@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,
para.upCode,
para.data) ;
}
- log.info("鍒嗘瀽涓婅鏁版嵁<" + CodeV202404.getCodeName(para.upCode) + " RTU鍦板潃=" + para.rtuAddr + ">:\n" + para.data.toString());
+ log.info("\n鍒嗘瀽涓婅鏁版嵁<" + CodeV202404.getCodeName(para.upCode) + " RTU鍦板潃=" + para.rtuAddr + ">:\n" + para.data.toString());
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 ;//涓婅鏁版嵁鍗佸叚杩涘埗褰㈠紡
@@ -47,19 +49,22 @@
downCpParams.setValue(
null,
ProtocolConstantV206V202404.protocolName,
+ para.protocolVersion,
para.rtuAddr,
Command.defaultId,
confirmComCode,
para.data.subData==null?null:(((DataV202404)para.data.subData).subData),
null);
//鏋勯�犲簲绛�
- byte[] data = new Cd_02_Down().doParse(downCpParams) ;
+ byte[] data = new Cd_C2_Down().doParse(downCpParams) ;
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 ;//涓嬭鍛戒护鍔熻兘鐮�;
+ confirmCommand.downCodeName = CodeV202404.getCodeName(confirmComCode) ;//涓嬭鍛戒护鍔熻兘鐮佸悕绉�;
confirmCommand.downBuffer = data ;//涓嬭鍛戒护鏁版嵁
confirmCommand.downBufHex = ByteUtil.bytes2Hex(data, true) ;//涓嬭鍛戒护鏁版嵁鍗佸叚杩涘埗褰㈠紡
confirmCommand.hasResponse = false ;//鏄惁鏈夊簲绛�
@@ -71,8 +76,19 @@
//浣庡姛鑰楁椂锛屽敖蹇彂閫�
confirmCommand.isQuickSend = true ;
}
- callback.callback(midRs.reportOrResponse_trueOrFalse);
- return new MidResult[]{midRs, confirmCommand} ;
+ callback.callback(midRs.reportOrResponse_trueOrFalse, para.data.subData==null?null:((DataV202404)(para.data.subData)).subData);
+ if(para.data != null && para.data.getSubData() != null){
+ DataCdC2Vo subData = (DataCdC2Vo)((DataV202404)para.data.getSubData()).subData ;
+ // public Byte opType2 ;//寮�鍚叧闂細0: 寮�鍚� -1:鍏抽棴
+ // public Boolean success ;//鎵ц缁撴灉锛坱rue鎴愬姛, false澶辫触锛�
+ if(subData.opType2.byteValue() == 0 && subData.success){
+ callback.notify(new ValveStateInfo(true));
+ }else if(subData.opType2.byteValue() == 1 && subData.success){
+ callback.notify(new ValveStateInfo(false));
+ }
+ }
+
+ return new MidResult[]{confirmCommand, midRs} ;
}
/**
* 鎵ц鍒嗘瀽
@@ -84,7 +100,7 @@
*/
protected void doParse(byte[] bs, int bsLen, String dataCode, Data data) throws Exception {
DataV202404 dV1 = (DataV202404)data.getSubData() ;
- DataCdC2Vo cdData = new DataCdC2Vo() ;
+ DataCdC2Vo cdData = new DataCdC2Vo(CodeV202404.getCodeName(dataCode)) ;
dV1.subData = cdData ;
int index = ProtocolConstantV206V202404.dataIndex ;
cdData.controllerType = ByteUtil.bytes2Hex(bs, false, index, 1) ;
@@ -106,5 +122,19 @@
cdData.success = true ;
}else{
cdData.success = false ;
- } }
+ }
+
+ if(!cdData.success){
+ return ;
+ }
+
+ index++ ;
+ cdData.orderNo = ByteUtil.BCD2String_BE(bs, index, index + 7) ;
+
+ index += 8 ;
+ GlParse.parseRtuDt(bs, index);
+
+ index+= 6 ;
+ GlParse.parseAlarmAndState(bs, index, cdData);//鍥涗釜瀛楄妭
+ }
}
--
Gitblit v1.8.0