From 427d87e5572d72d0e3aaa4364e4f53569222e321 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 25 三月 2025 21:40:05 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/Cd_83_Up.java | 47 +++++++++++++++++++++++++++++------------------
1 files changed, 29 insertions(+), 18 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/Cd_83_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/Cd_83_Up.java
index 955e52f..1ea1bc0 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/Cd_83_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/Cd_83_Up.java
@@ -24,7 +24,7 @@
@Override
public MidResult[] parse(Boolean isLowPower, CodeParseParams params, CodeParseCallback callback)throws Exception {
ParseParamsForUpV2 para = (ParseParamsForUpV2)params ;
- int bsLen = new CommonV2().parseDataLen(para.upBuffer) ;
+ int bsLen = new CommonV2().parseDataLen4P206(para.upBuffer) ;
if(bsLen > 0){
this.doParse(para.upBuffer,
bsLen,
@@ -77,16 +77,16 @@
confirmCommand.isQuickSend = true ;
}
- callback.callback(midRs.reportOrResponse_trueOrFalse);
+ callback.callback(midRs.reportOrResponse_trueOrFalse, para.data.subData==null?null:((DataV2)(para.data.subData)).subData);
if(para.data != null && para.data.getSubData() != null){
- Object subData = para.data.getSubData() ;
+ Object subData = ((DataV2)para.data.getSubData()).subData ;
if(subData instanceof DataCd83OpenVo){
callback.notify(new ValveStateInfo(true));
}else if(subData instanceof DataCd83CloseVo){
callback.notify(new ValveStateInfo(false));
}
}
- return new MidResult[]{midRs, confirmCommand} ;
+ return new MidResult[]{confirmCommand, midRs} ;
}
/**
* 鎵ц鍒嗘瀽
@@ -116,20 +116,25 @@
short index = ProtocolConstantV206V2.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瀛楄妭浣庝綅鍦ㄥ墠楂樹綅鍦ㄥ悗銆�
- cdData.icCardNo = GlParse.parseIcCardNo(bs, index) ;
+ 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 ;
@@ -154,21 +159,27 @@
short index = ProtocolConstantV206V2.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+骞淬��
@@ -180,17 +191,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 ;
@@ -222,7 +233,7 @@
Data data = new Data() ;
data.setSubData(new DataV2()) ;
- int bsLen = new CommonV2().parseDataLen(bs) ;
+ int bsLen = new CommonV2().parseDataLen4P206(bs) ;
if(bsLen > 0){
try {
obj.doParse(bs,
--
Gitblit v1.8.0