From c7c8554e2b9809bc90ac4a43fdaa39dfe16f4ab0 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 09 五月 2025 14:09:32 +0800
Subject: [PATCH] “远程测控”功能返回数据中增加protocol和protocolVersion属性，以备前端做多协议兼容。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_83_Up.java | 59 ++++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 42 insertions(+), 17 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_83_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_83_Up.java
index 05ed673..1f722b4 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_83_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_83_Up.java
@@ -5,6 +5,7 @@
import com.dy.common.mw.protocol.p206V1.parse.global.GlParse;
import com.dy.common.mw.protocol.p206V1.upVos.DataCd83CloseVo;
import com.dy.common.mw.protocol.p206V1.upVos.DataCd83OpenVo;
+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,7 +24,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,
@@ -34,6 +35,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 ;//涓婅鏁版嵁鍗佸叚杩涘埗褰㈠紡
@@ -47,6 +49,7 @@
downCpParams.setValue(
null,
ProtocolConstantV206V1.protocolName,
+ para.protocolVersion,
para.rtuAddr,
Command.defaultId,
confirmComCode,
@@ -57,6 +60,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,9 +76,17 @@
//浣庡姛鑰楁椂锛屽敖蹇彂閫�
confirmCommand.isQuickSend = true ;
}
+ if(para.data != null && para.data.getSubData() != null){
+ Object subData = ((DataV1)para.data.getSubData()).subData ;
+ if(subData instanceof DataCd83OpenVo){
+ callback.notify(new ValveStateInfo(true));
+ }else if(subData instanceof DataCd83CloseVo){
+ callback.notify(new ValveStateInfo(false));
+ }
+ }
- 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);
+ return new MidResult[]{confirmCommand, midRs} ;
}
/**
* 鎵ц鍒嗘瀽
@@ -104,20 +116,26 @@
short index = ProtocolConstantV206V1.dataIndex + 1 ;
//绱娴侀噺锛�5瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~99999999.99锛屽崟浣嶄负m3銆�
- int tpInt = ByteUtil.BCD2Int_LE(bs, index, index + 4) ;
- cdData.totalAmount = tpInt/100.0 ;
+ long tpLong = ByteUtil.BCD2Long_LE(bs, index, index + 4) ;
+ cdData.totalAmount = tpLong/100.0 ;
index += 5 ;
//鐢ㄦ按鎴峰彿鏁版嵁鏍煎紡锛�8瀛楄妭浣庝綅鍦ㄥ墠楂樹綅鍦ㄥ悗銆�
+ if(ByteUtil.bytesIsAll0xFF(bs, index, 8)){
+ throw new Exception("IC鍗″彿鏁版嵁鏍煎紡閿欒锛�8瀛楄妭鍏ㄩ儴涓�0xFF锛岃垗寮冩暟鎹�") ;
+ }
cdData.icCardNo = GlParse.parseIcCardNo(bs, index) ;
index += 8 ;
//IC鍗″彿鏍煎紡锛�4瀛楄妭HEX鐮佷綆浣嶅湪鍓嶉珮浣嶅湪鍚庛��
+ if(ByteUtil.bytesIsAll0xFF(bs, index, 4)){
+ throw new Exception("IC鍦板潃鏁版嵁鏍煎紡閿欒锛�4瀛楄妭鍏ㄩ儴涓�0xFF锛岃垗寮冩暟鎹�") ;
+ }
cdData.icCardAddr = ByteUtil.bytes2Hex_LE(bs, false, index, 4) ;
index += 4 ;
//鐢ㄦ按鎴蜂綑棰濓細鐢ㄦ埛浣欓4瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0.00~999999.99锛屽崟浣嶄负鍏冦��
- tpInt = ByteUtil.BCD2Int_LE(bs, index, index + 3) ;
+ int tpInt = ByteUtil.BCD2Int_LE(bs, index, index + 3) ;
cdData.remainMoney = tpInt/100.0 ;
index += 4 ;
@@ -142,21 +160,27 @@
short index = ProtocolConstantV206V1.dataIndex + 1 ;
//绱娴侀噺锛�5瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~9999999999锛屽崟浣嶄负m3銆�
- int tpInt = ByteUtil.BCD2Int_LE(bs, index, index + 4) ;
- cdData.totalAmount = tpInt/100.0 ;
+ long tpLong = ByteUtil.BCD2Long_LE(bs, index, index + 4) ;
+ cdData.totalAmount = tpLong/100.0 ;
index += 5 ;
//鐢ㄦ按鎴峰彿鏁版嵁鏍煎紡锛�8瀛楄妭浣庝綅鍦ㄥ墠楂樹綅鍦ㄥ悗銆�
+ if(ByteUtil.bytesIsAll0xFF(bs, index, 8)){
+ throw new Exception("IC鍗″彿鏁版嵁鏍煎紡閿欒锛�8瀛楄妭鍏ㄩ儴涓�0xFF锛岃垗寮冩暟鎹�") ;
+ }
cdData.icCardNo = GlParse.parseIcCardNo(bs, index) ;
index += 8 ;
//IC鍗″彿鏍煎紡锛�4瀛楄妭HEX鐮佷綆浣嶅湪鍓嶉珮浣嶅湪鍚庛��
+ if(ByteUtil.bytesIsAll0xFF(bs, index, 4)){
+ throw new Exception("IC鍦板潃鏁版嵁鏍煎紡閿欒锛�4瀛楄妭鍏ㄩ儴涓�0xFF锛岃垗寮冩暟鎹�") ;
+ }
cdData.icCardAddr = ByteUtil.bytes2Hex_LE(bs, false, index, 4) ;
index += 4 ;
//鐢ㄦ按鎴蜂綑棰濓細鐢ㄦ埛浣欓4瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0.00~999999.99锛屽崟浣嶄负鍏冦��
- tpInt = ByteUtil.BCD2Int_LE(bs, index, index + 3) ;
- cdData.remainMoney = tpInt/100.0 ;
+ tpLong = ByteUtil.BCD2Long_LE(bs, index, index + 3) ;
+ cdData.remainMoney = tpLong/100.0 ;
index += 4 ;
//鐢ㄦ按鎴风敤姘村紑濮嬫椂闂达細6瀛楄妭BCD鐮侊紝椤哄簭鏄勾鏈堟棩鏃跺垎绉掞紝鍏朵腑鍏厓骞�=2000+骞淬��
@@ -168,17 +192,17 @@
index += 6 ;
//鐢ㄦ按鎴锋湰娆＄敤姘撮噺锛氱疮璁℃祦閲�5瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~9999999999锛屽崟浣嶄负m3銆�
- tpInt = ByteUtil.BCD2Int_LE(bs, index, index + 4) ;
- cdData.thisAmount = tpInt/100.0 ;
+ tpLong = ByteUtil.BCD2Long_LE(bs, index, index + 4) ;
+ cdData.thisAmount = tpLong/100.0 ;
index += 5 ;
//鐢ㄦ按鎴锋湰娆℃秷璐归噾棰濓細鐢ㄦ埛浣欓4瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0.00~999999.99锛屽崟浣嶄负鍏冦��
- tpInt = ByteUtil.BCD2Int_LE(bs, index, index + 3) ;
- cdData.thisMoney = tpInt/100.0 ;
+ tpLong = ByteUtil.BCD2Long_LE(bs, index, index + 3) ;
+ cdData.thisMoney = tpLong/100.0 ;
index += 4 ;
//鐢ㄦ按鎴锋湰娆＄敤姘存椂闀匡細鐢ㄦ按鏃堕暱2瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~9999锛屽崟浣嶄负鍒嗛挓銆�
- tpInt = ByteUtil.BCD2Int_LE(bs, index, index + 1) ;
+ int tpInt = ByteUtil.BCD2Int_LE(bs, index, index + 1) ;
cdData.thisTime = tpInt;
index += 2 ;
@@ -204,13 +228,14 @@
Cd_83_Up obj = new Cd_83_Up() ;
//涓嬮潰涓ゆ潯涓婃姤鏁版嵁锛孖C鍗＄紪鐮侀兘鏄潪BCD缂栫爜鑰屽紓甯�
//String hex = "683C68B08485353448830200000000001000282353FE739444000001000313000101211615000101210000000000000000000200019000011518000101210A7B16";
- String hex = "683C68B05301154CEA8306001000000004343638483BBBB9E0001000001603000101215907000101210000000000000000000500019000015308000101210AF716";
+ //String hex = "683C68B05301154CEA8306001000000004343638483BBBB9E0001000001603000101215907000101210000000000000000000500019000015308000101210AF716";
+ String hex = "683868B0532328B90083074065840000FE00061010282353535B7F7691590100404022231024737F3F3F1FFF957296944239050000390001900000F916";
byte[] bs = ByteUtil.hex2Bytes(hex) ;
Data data = new Data() ;
data.setSubData(new DataV1()) ;
- int bsLen = new CommonV1().parseDataLen(bs) ;
+ int bsLen = new CommonV1().parseDataLen4P206(bs) ;
if(bsLen > 0){
try {
obj.doParse(bs,
--
Gitblit v1.8.0