From b16bb22a803b1ec2960822f08b30503a732ab3af Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 09 八月 2024 10:10:09 +0800
Subject: [PATCH] 通信中间件实现上行数据任务:恢复虚拟卡在取水口上占用状态为非占用状态

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_C2_Up.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_C2_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_C2_Up.java
index 140c37b..3c6af4c 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_C2_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_C2_Up.java
@@ -4,7 +4,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.DataCd02Vo;
 import com.dy.common.mw.protocol.p206V202404.upVos.DataCdC2Vo;
 import com.dy.common.util.ByteUtil;
 import org.apache.logging.log4j.LogManager;
@@ -85,7 +84,7 @@
      */
     protected void doParse(byte[] bs, int bsLen, String dataCode, Data data) throws Exception {
         DataV202404 dV1 = (DataV202404)data.getSubData() ;
-        DataCdC2Vo cdData = new DataCdC2Vo() ;
+        DataCdC2Vo cdData = new DataCdC2Vo(CodeV202404.getCodeName(dataCode)) ;
         dV1.subData = cdData ;
         int index = ProtocolConstantV206V202404.dataIndex ;
         cdData.controllerType = ByteUtil.bytes2Hex(bs, false, index, 1) ;
@@ -109,6 +108,10 @@
             cdData.success = false ;
         }
 
+        if(!cdData.success){
+            return ;
+        }
+
         index++ ;
         GlParse.parseRtuDt(bs, index);
 

--
Gitblit v1.8.0