From 7d05aad173c1e605419ea38ff598b9c7572c611d Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 15 八月 2024 08:36:20 +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/p206V1_0_0/parse/Cd_84_Up.java | 27 ++++++++++++---------------
1 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_84_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_84_Up.java
index fe33156..a5f7245 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_84_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_84_Up.java
@@ -88,35 +88,32 @@
dV1.subData = cdData ;
short index = ProtocolConstantV206V1_0_0.dataIndex ;
- //cdData.opType = bs[index] ;
+ cdData.opType = (byte)ByteUtil.BCD2Int_LE(bs[index]) ;
- //index++ ;
- //cdData.cardType = bs[index] ;
+ index++ ;
+ cdData.cardType = bs[index] ;
- //index++ ;
- //cdData.cardAddr = ByteUtil.bytes2Hex(bs, false, index, 4) ;
+ index++ ;
+ cdData.cardAddr = ByteUtil.bytes2Hex_LE(bs, false, index, 4) ;
- //index += 4 ;
- //鐢ㄦ按鎴峰彿鏁版嵁鏍煎紡锛�5瀛楄妭BCD鐮佷綆浣嶅湪鍓嶉珮浣嶅湪鍚庛��
- cdData.cardNo = ByteUtil.BCD2String_LE(bs, index, index + 4) ;
+ index += 4 ;
+ //鐢ㄦ按鎴峰彿鏁版嵁鏍煎紡锛�8瀛楄妭浣庝綅鍦ㄥ墠楂樹綅鍦ㄥ悗銆�
+ cdData.cardNo = GlParse.parseIcCardNo(bs, index) ;
- index += 5 ;
+ index += 8 ;
//鐢ㄦ按鎴蜂綑棰濓細鐢ㄦ埛浣欓4瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0.00~999999.99锛屽崟浣嶄负鍏冦��
- cdData.remainMoney = 0.0D ;
int tpInt = ByteUtil.BCD2Int_LE(bs, index, index + 3) ;
- cdData.remainMoney += tpInt/100.0 ;
+ cdData.remainMoney = tpInt/100.0 ;
index += 4 ;
//绱娴侀噺锛�5瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~9999999999锛屽崟浣嶄负m3銆�
- cdData.totalAmount = 0.0D ;
tpInt = ByteUtil.BCD2Int_LE(bs, index, index + 4) ;
- cdData.totalAmount += tpInt;
+ cdData.totalAmount = tpInt/100.0;
index += 5 ;
//鐬椂娴侀噺锛�5瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~9999999.999锛屽崟浣嶄负m3/h銆�
- cdData.instantAmount = 0.0D ;
tpInt = ByteUtil.BCD2Int_LE(bs, index, index + 4) ;
- cdData.instantAmount += tpInt/1000.0 ;
+ cdData.instantAmount = tpInt/1000.0 ;
index += 5 ;
cdData.alarmVo = GlParse.parseAlarm(bs, index) ;
--
Gitblit v1.8.0