From 186aac796d81fd1799c9503558c1081c5102ab74 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 27 二月 2025 17:18:11 +0800
Subject: [PATCH] 根据RTU协议修改内容，将开关阀类型加入上报数据中；
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_8A_Up.java | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_8A_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_8A_Up.java
index 9500a15..141284c 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_8A_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_8A_Up.java
@@ -22,7 +22,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,
@@ -33,6 +33,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 +47,7 @@
downCpParams.setValue(
null,
ProtocolConstantV206V202404.protocolName,
+ para.protocolVersion,
para.rtuAddr,
Command.defaultId,
confirmComCode,
@@ -56,6 +58,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 ;//涓嬭鍛戒护鍔熻兘鐮�;
@@ -71,8 +74,8 @@
//浣庡姛鑰楁椂锛屽敖蹇彂閫�
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);
+ return new MidResult[]{confirmCommand, midRs} ;
}
/**
* 鎵ц鍒嗘瀽
@@ -93,24 +96,24 @@
cdData.projectNo = (int)bs[index];
index++ ;
- Long lng = ByteUtil.BCD2Long_LE(bs, index, index + 4) ;
+ Long lng = ByteUtil.BCD2Long_BE(bs, index, index + 4) ;
cdData.lng = lng/1000000.0D;
index += 5 ;
- Long lat = ByteUtil.BCD2Long_LE(bs, index, index + 4) ;
+ Long lat = ByteUtil.BCD2Long_BE(bs, index, index + 4) ;
cdData.lat = lat/1000000.0D;
index += 5 ;
- int softVersion = ByteUtil.BCD2Int_LE(bs, index, index + 1) ;
- cdData.softVersion = softVersion/10.0F;
+ int softVersion = ByteUtil.BCD2Int_BE(bs, index, index + 1) ;
+ cdData.softVersion = softVersion/100.0F;
index += 2 ;
- int hardVersion = ByteUtil.BCD2Int_LE(bs, index, index + 1) ;
- cdData.hardVersion = hardVersion/10.0F;
+ int hardVersion = ByteUtil.BCD2Int_BE(bs, index, index + 1) ;
+ cdData.hardVersion = hardVersion/100.0F;
index += 2 ;
- int protocolVersion = ByteUtil.BCD2Int_LE(bs, index, index + 1) ;
- cdData.protocolVersion = protocolVersion/10.0F;
+ int protocolVersion = ByteUtil.BCD2Int_BE(bs, index, index + 1) ;
+ cdData.protocolVersion = protocolVersion/100.0F;
}
}
--
Gitblit v1.8.0