From 85aaa9abe1b0fe8e99b0c09356b7329ed0c1cd8b Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期四, 30 五月 2024 09:46:14 +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 | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 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 2b7f0b1..293a0fa 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
@@ -87,10 +87,19 @@
dV1.subData = cdData ;
short index = ProtocolConstantV206V1_0_0.dataIndex ;
+ cdData.opType = bs[index] ;
+
+ index++ ;
+ cdData.cardType = bs[index] ;
+
+ index++ ;
+ cdData.cardAddr = ByteUtil.bytes2Hex(bs, false, index, 4) ;
+
+ index += 4 ;
//鐢ㄦ按鎴峰彿鏁版嵁鏍煎紡锛�5瀛楄妭BCD鐮佷綆浣嶅湪鍓嶉珮浣嶅湪鍚庛��
cdData.cardNo = ByteUtil.BCD2String_LE(bs, index, index + 4) ;
- index += 5 ;
+ index += 5 ;
//鐢ㄦ按鎴蜂綑棰濓細鐢ㄦ埛浣欓4瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0.00~999999.99锛屽崟浣嶄负鍏冦��
cdData.remainMoney = 0.0D ;
int tpInt = ByteUtil.BCD2Int_LE(bs, index, index) ;
@@ -142,6 +151,11 @@
index++ ;
cdData.instantAmount += tpInt * 100000.0 ;
+ cdData.alarmVo = GlParse.parseAlarm(bs, index) ;
+ index += 2 ;
+ cdData.stateVo = GlParse.parseState(bs, index) ;
+ index += 2 ;
+
//鎺у埗鍣ㄦ椂閽�
cdData.rtuDt = GlParse.parseTp(bs, index) ;
//index += 6 ;
--
Gitblit v1.8.0