From 4c391aa12cdb8e32d194cfc70096c6a5dea72893 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期五, 13 九月 2024 09:26:54 +0800
Subject: [PATCH] 优化代码 指定时间段内用水量超过指定值的农户 指定时间段内消费金额超过指定值的农户 指定时间段内用水时长超过指定值的农户
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_55_Up.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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 545af6c..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 ;
--
Gitblit v1.8.0