From 0e877574ab499260677ab81c2c0298eb25fe4fd0 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 13 五月 2024 16:19:23 +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/Cd_55_Up.java | 17 +++--------------
1 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_55_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_55_Up.java
index 19a8adb..a6ec690 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_55_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_55_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<DataCd55Vo> list = new ArrayList<>() ;
DataCd55Vo vo = this.doParseData(bs, index, bsLen, controllerType, projectNo) ;
while(vo != null){
- index += 39 ;
+ index += 35 ;
list.add(vo) ;
vo = this.doParseData(bs, index, bsLen, controllerType, projectNo) ;
}
@@ -115,18 +115,7 @@
}
index += 1 ;
- String ss = ByteUtil.BCD2String_BE(bs, index, index) ;
- index++ ;
- String mm = ByteUtil.BCD2String_BE(bs, index, index) ;
- index++ ;
- String HH = ByteUtil.BCD2String_BE(bs, index, index) ;
- index++ ;
- String dd = ByteUtil.BCD2String_BE(bs, index, index) ;
- index++ ;
- String MM = ByteUtil.BCD2String_BE(bs, index, index) ;
- index++ ;
- String yy = ByteUtil.BCD2String_BE(bs, index, index) ;
- cdData.dt = "20" + yy + "-" + MM + "-" + dd + " " + HH + ":" + mm + ":" + ss ;
+ cdData.dt = GlParse.parseRtuDt(bs, index) ;
return cdData ;
}else{
--
Gitblit v1.8.0