From 3fe912a1d0ceca7cd0281e26b798b55b539ec2cd Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期二, 15 十月 2024 15:19:56 +0800 Subject: [PATCH] 修改通信中间件上行数据的漏损量处理逻辑,对于当天发现的控制器,控制器计算的漏损量一定不正确,强制设置成0; --- 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