From 3511619ad42e1706b1e798bf846426f1083bc63d Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 01 七月 2024 15:44:32 +0800
Subject: [PATCH] 靳总协议与王工协议开关阀报数据库层面统一在一起。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_55_Up.java | 34 ++++++++++++----------------------
1 files changed, 12 insertions(+), 22 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 19a8adb..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
@@ -63,18 +63,19 @@
String controllerType = ByteUtil.bytes2Hex(bs, false, index, 1) ;
index++ ;
- Integer projectNo = 0 + bs[index];
+ Integer projectNo = (int)bs[index];
index++ ;
byte hasRecord = bs[index];
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 += 39 ;
+ 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] ;
@@ -115,18 +116,7 @@
}
index += 1 ;
- String ss = ByteUtil.BCD2String_BE(bs, index, index) ;
- index++ ;
- String mm = ByteUtil.BCD2String_BE(bs, index, index) ;
- index++ ;
- String HH = ByteUtil.BCD2String_BE(bs, index, index) ;
- index++ ;
- String dd = ByteUtil.BCD2String_BE(bs, index, index) ;
- index++ ;
- String MM = ByteUtil.BCD2String_BE(bs, index, index) ;
- index++ ;
- String yy = ByteUtil.BCD2String_BE(bs, index, index) ;
- cdData.dt = "20" + yy + "-" + MM + "-" + dd + " " + HH + ":" + mm + ":" + ss ;
+ cdData.dt = GlParse.parseRtuDt(bs, index) ;
return cdData ;
}else{
--
Gitblit v1.8.0