From fbf006ebb7b755700ba6572d6b8bce11862ee7e3 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期五, 20 九月 2024 10:23:13 +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_83_Up.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_83_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_83_Up.java
index 1e77cc4..7996250 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_83_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_83_Up.java
@@ -5,6 +5,7 @@
import com.dy.common.mw.protocol.p206V202404.*;
import com.dy.common.mw.protocol.p206V202404.upVos.DataCd83Vo;
import com.dy.common.util.ByteUtil;
+import com.dy.common.util.DateTime;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -115,6 +116,20 @@
index += 4 ;
cdData.batteryVolt = ByteUtil.BCD2Int_LE(bs, index, index + 1)/100.0D ;
+ index += 2 ;
+ 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) ;
+ index ++ ;
+ String yy = ByteUtil.BCD2String_LE(bs, index, index) ;
+
+ String ymd = "20" + yy + "-" + mm + "-" + dd ;
+
+ cdData.rtuDt = ymd + " " + hh ;
+
+ cdData.dataDt = DateTime.lastXDay_yyyy_MM_dd(ymd, 1) ;
}
}
--
Gitblit v1.8.0