From ac47ec165d87f505d80761ac92a0ece0ae84d215 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期五, 26 七月 2024 14:49:15 +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_5C_Up.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_5C_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_5C_Up.java
index 359696b..71111b7 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_5C_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_5C_Up.java
@@ -3,7 +3,6 @@
import com.dy.common.mw.protocol.*;
import com.dy.common.mw.protocol.p206V202404.*;
-import com.dy.common.mw.protocol.p206V202404.parse.global.GlParse;
import com.dy.common.mw.protocol.p206V202404.upVos.DataCd5CVo;
import com.dy.common.util.ByteUtil;
import org.apache.logging.log4j.LogManager;
@@ -70,11 +69,12 @@
if(hasRecord == 1){
//鏈夎褰�
List<DataCd5CVo> list = new ArrayList<>() ;
- DataCd5CVo vo = this.doParseData(bs, index, bsLen, controllerType, projectNo) ;
+ index++ ;
+ DataCd5CVo vo = this.doParseData(bs, index, bsLen, dataCode, controllerType, projectNo) ;
while(vo != null){
index += 16 ;
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 +82,10 @@
}
}
- private DataCd5CVo doParseData(byte[] bs, int index, int bsLen, String controllerType,Integer projectNo) throws Exception{
- //姣忔潯鏁版嵁鍗�39瀛楄妭
+ private DataCd5CVo doParseData(byte[] bs, int index, int bsLen, String dataCode, String controllerType,Integer projectNo) throws Exception{
+ //姣忔潯鏁版嵁鍗�16瀛楄妭
if(bsLen - index > 16){
- DataCd5CVo cdData = new DataCd5CVo() ;
+ DataCd5CVo cdData = new DataCd5CVo(CodeV202404.getCodeName(dataCode)) ;
cdData.controllerType = controllerType ;
cdData.projectNo = projectNo ;
@@ -99,15 +99,15 @@
String yy = ByteUtil.BCD2String_BE(bs, index, index) ;
cdData.dt = "20" + yy + "-" + MM + "-" + dd + " " + HH ;
- int meterAmountDay = ByteUtil.BCD2Int_BE(bs, index, index + 3) ;
+ Long meterAmountDay = ByteUtil.BCD2Long_LE(bs, index, index + 3) ;
cdData.meterAmountDay = meterAmountDay/100.0D;
index += 4 ;
- int farmerAmountDay = ByteUtil.BCD2Int_BE(bs, index, index + 3) ;
+ Long farmerAmountDay = ByteUtil.BCD2Long_LE(bs, index, index + 3) ;
cdData.farmerAmountDay = farmerAmountDay/100.0D;
index += 4 ;
- int lossAmountDay = ByteUtil.BCD2Int_BE(bs, index, index + 3) ;
+ Long lossAmountDay = ByteUtil.BCD2Long_LE(bs, index, index + 3) ;
cdData.lossAmountDay = lossAmountDay/100.0D;
return cdData ;
--
Gitblit v1.8.0