From 2938172b377e5ed7a55e5dde4a218244445e8a6e Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期三, 15 五月 2024 17:10:12 +0800
Subject: [PATCH] 田间灌溉项目管理 修改项目信息接口 修改项目状态接口

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_5C_Up.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 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 8f0dfc1..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
@@ -63,7 +63,7 @@
         String controllerType = ByteUtil.bytes2Hex(bs, false, index, 1) ;
 
         index++ ;
-        Integer projectNo = 0 + bs[index];
+        Integer projectNo = (int)bs[index];
 
         index++ ;
         byte hasRecord = bs[index];
@@ -72,7 +72,7 @@
             List<DataCd5CVo> list = new ArrayList<>() ;
             DataCd5CVo vo = this.doParseData(bs, index, bsLen, controllerType, projectNo) ;
             while(vo != null){
-                index += 39 ;
+                index += 16 ;
                 list.add(vo) ;
                 vo = this.doParseData(bs, index, bsLen, controllerType, projectNo) ;
             }
@@ -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