From 33e1f47419d28736b17d6947bb15ccc290b2905a Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期三, 26 二月 2025 17:42:45 +0800 Subject: [PATCH] 1、代码完善; 2、江海协议解析不正确处修改,如金额是4位小数; 3、根据江海协议,新建RTU模拟器模块,可以上报心跳、开阀、关阀数据。 --- 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 f56919e..d03d85e 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 @@ -153,7 +153,7 @@ index += 5 ; Long moneyRemain = ByteUtil.BCD2Long_LE(bs, index, index + 4) ; - cdData.moneyRemain = moneyRemain/100.0D; + cdData.moneyRemain = moneyRemain/10000.0D; index += 5 ; Long waterRemain = ByteUtil.BCD2Long_LE(bs, index, index + 4) ; @@ -169,7 +169,7 @@ index += 4 ; int thisMoney = ByteUtil.BCD2Int_LE(bs, index, index + 3) ; - cdData.thisMoney = thisMoney/100.0D; + cdData.thisMoney = thisMoney/10000.0D; index += 4 ; cdData.thisDuration = ByteUtil.BCD2Int_LE(bs, index, index + 1) ; -- Gitblit v1.8.0