From 3c2c295ec48587fe9d9f656e0baa74c71a3884f7 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期日, 27 十月 2024 16:46:45 +0800
Subject: [PATCH] 1、苏有勋把开关阀报（功能码83）报中的控制器时钟去除掉了，通信中间件解决这个报文时，把开阀报中的开阀时间当作控制器时钟，把关阀报中的关阀时间作为控制器时钟； 2、优化代码。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlParse.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlParse.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlParse.java
index 028f991..2484a8f 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlParse.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlParse.java
@@ -48,12 +48,12 @@
* @throws Exception 寮傚父
*/
public static String parseIcCardNo(byte[] bs, int index)throws Exception{
- String rtuAddrStr = "" + ByteUtilUnsigned.bytes2Short_LE(bs, index) ;
- String rtuAddrBCD = "" + ByteUtil.BCD2Long_LE(bs, index + 2, index + 7) ;
- while(rtuAddrStr.length() < 5){
- rtuAddrStr = "0" + rtuAddrStr ;
+ String icNoStr = "" + ByteUtilUnsigned.bytes2Short_LE(bs, index) ;
+ String icNoBCD = "" + ByteUtil.BCD2Long_LE(bs, index + 2, index + 7) ;
+ while(icNoStr.length() < 5){
+ icNoStr = "0" + icNoStr ;
}
- return rtuAddrBCD + rtuAddrStr ;
+ return icNoBCD + icNoStr ;
}
--
Gitblit v1.8.0