From 842237345ac469b02e9add8f9fd8bae5d4f7cdac Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期二, 25 二月 2025 14:33:15 +0800 Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlParse.java | 6 +++--- 1 files changed, 3 insertions(+), 3 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 c431d83..f56919e 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 @@ -241,7 +241,7 @@ cdData.projectNo = (int)bs[index]; index ++ ; - cdData.opType = bs[index]; + cdData.clType = bs[index]; index++ ; cdData.icCardAddr = ByteUtil.bytes2Hex(bs, false, index, 4) ; @@ -265,7 +265,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 ; @@ -277,7 +277,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