From 5bfa227109b90b20b09345722b3232fac77a1ab1 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期三, 11 九月 2024 11:41:53 +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/p206V202404/parse/Cd_55_Up.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_55_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_55_Up.java
index a6ec690..df10fe0 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_55_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_55_Up.java
@@ -70,11 +70,12 @@
if(hasRecord == 1){
//鏈夎褰�
List<DataCd55Vo> list = new ArrayList<>() ;
- DataCd55Vo vo = this.doParseData(bs, index, bsLen, controllerType, projectNo) ;
+ index++ ;
+ DataCd55Vo vo = this.doParseData(bs, index, bsLen, dataCode, controllerType, projectNo) ;
while(vo != null){
index += 35 ;
list.add(vo) ;
- vo = this.doParseData(bs, index, bsLen, controllerType, projectNo) ;
+ vo = this.doParseData(bs, index, bsLen, dataCode, controllerType, projectNo) ;
}
dV1.subData = list ;
}else{
@@ -82,10 +83,10 @@
}
}
- private DataCd55Vo doParseData(byte[] bs, int index, int bsLen, String controllerType,Integer projectNo) throws Exception{
- //姣忔潯鏁版嵁鍗�39瀛楄妭
+ private DataCd55Vo doParseData(byte[] bs, int index, int bsLen, String dataCode, String controllerType,Integer projectNo) throws Exception{
+ //姣忔潯鏁版嵁鍗�35瀛楄妭
if(bsLen - index > 35){
- DataCd55Vo cdData = new DataCd55Vo() ;
+ DataCd55Vo cdData = new DataCd55Vo(CodeV202404.getCodeName(dataCode)) ;
cdData.controllerType = controllerType ;
cdData.projectNo = projectNo ;
@@ -96,15 +97,15 @@
cdData.icCardNo = GlParse.parseIcCardNo(bs, index, 6, 2) ;
index += 8 ;
- int chargeMoney = ByteUtil.BCD2Int_BE(bs, index, index + 4) ;
+ Long chargeMoney = ByteUtil.BCD2Long_LE(bs, index, index + 4) ;
cdData.chargeMoney = chargeMoney/100.0D;
index += 5 ;
- int chargeWater = ByteUtil.BCD2Int_BE(bs, index, index + 4) ;
+ Long chargeWater = ByteUtil.BCD2Long_LE(bs, index, index + 4) ;
cdData.chargeWater = chargeWater/100.0D;
index += 5 ;
- cdData.flowNo = ByteUtil.BCD2String_BE(bs, index, index + 5) ;
+ cdData.flowNo = ByteUtil.BCD2String_LE(bs, index, index + 5) ;
index += 6 ;
byte flag = bs[index] ;
--
Gitblit v1.8.0