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_5C_Up.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/Cd_5C_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_5C_Up.java
index 359696b..ddbb100 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_5C_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_5C_Up.java
@@ -99,15 +99,15 @@
             String yy = ByteUtil.BCD2String_BE(bs, index, index) ;
             cdData.dt = "20" + yy + "-" + MM + "-" + dd + " " + HH  ;
 
-            int meterAmountDay = ByteUtil.BCD2Int_BE(bs, index, index + 3) ;
+            Long meterAmountDay = ByteUtil.BCD2Long_LE(bs, index, index + 3) ;
             cdData.meterAmountDay = meterAmountDay/100.0D;
 
             index += 4 ;
-            int farmerAmountDay = ByteUtil.BCD2Int_BE(bs, index, index + 3) ;
+            Long farmerAmountDay = ByteUtil.BCD2Long_LE(bs, index, index + 3) ;
             cdData.farmerAmountDay = farmerAmountDay/100.0D;
 
             index += 4 ;
-            int lossAmountDay = ByteUtil.BCD2Int_BE(bs, index, index + 3) ;
+            Long lossAmountDay = ByteUtil.BCD2Long_LE(bs, index, index + 3) ;
             cdData.lossAmountDay = lossAmountDay/100.0D;
 
             return cdData ;

--
Gitblit v1.8.0