From 276ce2ba5e91523f3c202cce0b0a8bae43630a5e Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期二, 03 六月 2025 10:37:21 +0800 Subject: [PATCH] 表阀一体协议与测控一体阀协议进行兼容时,阀门状态位判断未做兼容修改,本次进行修改并进行必要注释。 --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlParse.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlParse.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlParse.java index a2df974..80e7d3f 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlParse.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlParse.java @@ -346,7 +346,7 @@ cdData.eleTotalAmount = ByteUtil.BCD2Long_LE(bs, index, index + 4)/100.0D ; index += 5 ; - cdData.moneyRemain = ByteUtil.BCD2Long_LE(bs, index, index + 4)/100.0D ; + cdData.moneyRemain = ByteUtil.BCD2Long_LE(bs, index, index + 4)/10000.0D ; index += 5 ; cdData.waterRemain = ByteUtil.BCD2Long_LE(bs, index, index + 4)/100.0D ; @@ -358,7 +358,7 @@ cdData.thisWater = ByteUtil.BCD2Long_LE(bs, index, index + 3)/100.0D ; index += 4 ; - cdData.thisMoney = ByteUtil.BCD2Long_LE(bs, index, index + 3)/100.0D ; + cdData.thisMoney = ByteUtil.BCD2Long_LE(bs, index, index + 3)/10000.0D ; index += 4 ; cdData.thisDuration = ByteUtil.BCD2Int_LE(bs, index, index + 1) ; -- Gitblit v1.8.0