From 1fe74a6aba7cc02e6a5c00a227ff815639f825de Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 15 七月 2024 20:52:45 +0800
Subject: [PATCH] 1、实现RTU模拟器,并实现心跳上报、开阀上报、关阀上报; 2、基于RTU模拟器的开关阀上报,设计通信中间件上行数据处理任务的bug;

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_97_Down.java |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_97_Down.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_97_Down.java
index 33787cd..e981b9c 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_97_Down.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_97_Down.java
@@ -92,16 +92,17 @@
             throw new Exception("姘翠环涓嶈兘涓虹┖") ;
         }
 
-        String[] icCardNoGrp = CommonV1_0_1.dealIcCardNo(cvo.icCardNo) ;
-        if(icCardNoGrp[0] != null){
-            midRs.param = icCardNoGrp[0] ;
-        }
+        //String[] icCardNoGrp = CommonV1_0_1.dealIcCardNo(cvo.icCardNo) ;
+        //if(icCardNoGrp[0] != null){
+        //    midRs.param = icCardNoGrp[0] ;
+        //}
 
-        byte[] bs = new byte[11] ;
+        byte[] bs = new byte[14] ;
         index = 0 ;
-        ByteUtil.string2BCD_LE(bs, icCardNoGrp[1], index) ;
+        GlCreate.createIcCardNo(cvo.icCardNo, bs, index);
+        //ByteUtil.string2BCD_LE(bs, icCardNoGrp[1], index) ;
 
-        index += 5 ;
+        index += 8 ;
         Integer money = Double.valueOf(cvo.moneyRemain * 100.0D).intValue() ;
         byte[] bTemp = ByteUtil.int2BCD_LE(money) ;
         int bTempLen = bTemp.length ;

--
Gitblit v1.8.0