From c322d3be15f48adbc8b64ac9168b525744977128 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 11 十月 2024 08:50:18 +0800
Subject: [PATCH] 1、RTU日志信息中增加功能码名称； 2、得不到RTU日志文件时，输出一些信息。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_65_Up.java | 45 ++++++++++++++++-----------------------------
1 files changed, 16 insertions(+), 29 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_65_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_65_Up.java
index bab8637..4e2fa05 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_65_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_65_Up.java
@@ -70,11 +70,12 @@
if(hasRecord == 1){
//鏈夎褰�
List<DataCd65Vo> list = new ArrayList<>() ;
- DataCd65Vo vo = this.doParseData(bs, index, bsLen, controllerType, projectNo) ;
+ index++ ;
+ DataCd65Vo vo = this.doParseData(bs, index, bsLen, dataCode, controllerType, projectNo) ;
while(vo != null){
- index += 39 ;
+ index += 43 ;
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 DataCd65Vo doParseData(byte[] bs, int index, int bsLen, String controllerType,Integer projectNo) throws Exception{
- //姣忔潯鏁版嵁鍗�39瀛楄妭
- if(bsLen - index > 39){
- DataCd65Vo cdData = new DataCd65Vo() ;
+ private DataCd65Vo doParseData(byte[] bs, int index, int bsLen, String dataCode, String controllerType,Integer projectNo) throws Exception{
+ //姣忔潯鏁版嵁鍗�43瀛楄妭
+ if(bsLen - index > 43){
+ DataCd65Vo cdData = new DataCd65Vo(CodeV202404.getCodeName(dataCode)) ;
cdData.controllerType = controllerType ;
cdData.projectNo = projectNo ;
@@ -96,42 +97,28 @@
cdData.icCardNo = GlParse.parseIcCardNo(bs, index, 6, 2) ;
index += 8 ;
- int moneyRemain = ByteUtil.BCD2Int_BE(bs, index, index + 4) ;
+ Long moneyRemain = ByteUtil.BCD2Long_LE(bs, index, index + 4) ;
cdData.moneyRemain = moneyRemain/100.0D;
index += 5 ;
- int waterRemain = ByteUtil.BCD2Int_BE(bs, index, index + 4) ;
+ Long waterRemain = ByteUtil.BCD2Long_LE(bs, index, index + 4) ;
cdData.waterRemain = waterRemain/100.0D;
index += 5 ;
- int thisEle = ByteUtil.BCD2Int_BE(bs, index, index + 3) ;
+ int thisEle = ByteUtil.BCD2Int_LE(bs, index, index + 3) ;
cdData.thisEle = thisEle/100.0D;
index += 4 ;
- int thisWater = ByteUtil.BCD2Int_BE(bs, index, index + 3) ;
+ int thisWater = ByteUtil.BCD2Int_LE(bs, index, index + 3) ;
cdData.thisWater = thisWater/100.0D;
index += 4 ;
- 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) ;
- cdData.rtuStartDt = MM + "-" + dd + " " + HH + ":" + mm ;
+ cdData.rtuStartDt = GlParse.parseRtuDt(bs, index) ;
- index++ ;
- mm = ByteUtil.BCD2String_BE(bs, index, index) ;
- index++ ;
- HH = ByteUtil.BCD2String_BE(bs, index, index) ;
- index++ ;
- dd = ByteUtil.BCD2String_BE(bs, index, index) ;
- index++ ;
- MM = ByteUtil.BCD2String_BE(bs, index, index) ;
- cdData.rtuEndDt = MM + "-" + dd + " " + HH + ":" + mm ;
+ index += 6 ;
+ cdData.rtuEndDt = GlParse.parseRtuDt(bs, index) ;
- index++ ;
+ index += 6 ;
cdData.useWaterType = bs[index];
return cdData ;
--
Gitblit v1.8.0