From fbd4cf5aeb4274938c12030e5d235c65c20c19c3 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期三, 15 五月 2024 16:36:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_84_Up.java | 21 +++++++--------------
1 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_84_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_84_Up.java
index edb5e5c..bba3238 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_84_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_84_Up.java
@@ -106,27 +106,20 @@
index += 8 ;
cdData.orderNo = ByteUtil.BCD2String_BE(bs, index, index + 7) ;
- index ++ ;
- String mm = ByteUtil.BCD2String_LE(bs, index, index) ;
- index ++ ;
- String HH = ByteUtil.BCD2String_LE(bs, index, index) ;
- index ++ ;
- String dd = ByteUtil.BCD2String_LE(bs, index, index) ;
- index ++ ;
- String MM = ByteUtil.BCD2String_LE(bs, index, index) ;
- cdData.opDt = MM + "鏈�" + dd + "鏃�" + HH + "鏃�" + mm + "鍒�" ;
+ index += 8 ;
+ cdData.opDt = GlParse.parseRtuDt(bs, index) ;
- index ++ ;
- cdData.waterTotalAmount = ByteUtil.BCD2Int_BE(bs, index, index + 4)/100.0D ;
+ index += 6 ;
+ cdData.waterTotalAmount = ByteUtil.BCD2Long_LE(bs, index, index + 4)/100.0D ;
index += 5 ;
- cdData.eleTotalAmount = ByteUtil.BCD2Int_BE(bs, index, index + 4)/100.0D ;
+ cdData.eleTotalAmount = ByteUtil.BCD2Long_LE(bs, index, index + 4)/100.0D ;
index += 5 ;
- cdData.moneyRemainUser = ByteUtil.BCD2Int_BE(bs, index, index + 4)/100.0D ;
+ cdData.moneyRemainUser = ByteUtil.BCD2Long_LE(bs, index, index + 4)/100.0D ;
index += 5 ;
- cdData.waterRemainUser = ByteUtil.BCD2Int_BE(bs, index, index + 4)/100.0D ;
+ cdData.waterRemainUser = ByteUtil.BCD2Long_LE(bs, index, index + 4)/100.0D ;
index += 5 ;
GlParse.parseAlarmAndState(bs, index, cdData) ;
--
Gitblit v1.8.0