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_65_Up.java | 22 ++++------------------
1 files changed, 4 insertions(+), 18 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_65_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_65_Up.java
index bab8637..5875d55 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_65_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_65_Up.java
@@ -112,26 +112,12 @@
cdData.thisWater = thisWater/100.0D;
index += 4 ;
- 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) ;
- cdData.rtuStartDt = MM + "-" + dd + " " + HH + ":" + mm ;
+ cdData.rtuStartDt = GlParse.parseRtuDt(bs, index) ;
- index++ ;
- mm = ByteUtil.BCD2String_BE(bs, index, index) ;
- index++ ;
- HH = ByteUtil.BCD2String_BE(bs, index, index) ;
- index++ ;
- dd = ByteUtil.BCD2String_BE(bs, index, index) ;
- index++ ;
- MM = ByteUtil.BCD2String_BE(bs, index, index) ;
- cdData.rtuEndDt = MM + "-" + dd + " " + HH + ":" + mm ;
+ index += 6 ;
+ cdData.rtuEndDt = GlParse.parseRtuDt(bs, index) ;
- index++ ;
+ index += 6 ;
cdData.useWaterType = bs[index];
return cdData ;
--
Gitblit v1.8.0