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/p206V1_0_0/parse/Cd_99_Up.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_99_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_99_Up.java
index c6ca29d..2d476d2 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_99_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_99_Up.java
@@ -2,6 +2,7 @@
 
 import com.dy.common.mw.protocol.*;
 import com.dy.common.mw.protocol.p206V1_0_0.*;
+import com.dy.common.mw.protocol.p206V1_0_0.parse.global.GlParse;
 import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd98Vo;
 import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd99Vo;
 import com.dy.common.util.ByteUtil;
@@ -62,8 +63,9 @@
         DataCd99Vo cdData = new DataCd99Vo() ;
         dV1.subData = cdData ;
         //铏氭嫙鍗″彿
-        cdData.cardNo = ByteUtil.BCD2String_LE(bs, ProtocolConstantV206V1_0_0.dataIndex, ProtocolConstantV206V1_0_0.dataIndex+4) ;
-        if(bs[ProtocolConstantV206V1_0_0.dataIndex + 5] == (byte)0xAA){
+        cdData.cardNo = GlParse.parseIcCardNo(bs, ProtocolConstantV206V1_0_0.dataIndex) ;
+
+        if(bs[ProtocolConstantV206V1_0_0.dataIndex + 8] == (byte)0xAA){
             cdData.success = true ;
         }else{
             cdData.success = false ;

--
Gitblit v1.8.0