From c4d56f4a2c7687739f3bf0f43bcc1f35c9bbeb8b Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期三, 14 五月 2025 15:18:44 +0800 Subject: [PATCH] 1、表阀一体协议解析同步新版本;2、默认设备是表阀一体(0x02) --- pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmLossDay.java | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmLossDay.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmLossDay.java index 36a13c4..5181be6 100644 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmLossDay.java +++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmLossDay.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.dy.common.mw.protocol.p206V1.DataV1; import com.dy.common.mw.protocol.p206V2.DataV2; +import com.dy.common.mw.protocol.p206V202404.DataV202404; import com.dy.common.po.BaseEntity; import com.dy.common.util.DateTime; import com.fasterxml.jackson.annotation.JsonFormat; @@ -104,4 +105,11 @@ this.dtRtu = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.rtuDt); this.lossAmount = cdData.lossAmount ;// 鎹熷け娴侀噺(浠�0鏃跺埌褰撳墠鐨勬紡鎹熺疮璁℃祦閲忥紝24鏃朵竴涓懆鏈燂紝0鏃跺綊0)鍗曚綅涓簃3銆� } + + public void valueFrom(DataV202404 dV202404, com.dy.common.mw.protocol.p206V202404.upVos.DataCd83Vo cdData) throws Exception{ + this.dt = DateTime.dateFrom_yyyy_MM_dd1(cdData.dataDt); + this.dtLast = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV202404.dt); + this.dtRtu = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.dataDt); + this.lossAmount = cdData.lossTotalAmountDay ;// 鎹熷け娴侀噺(浠�0鏃跺埌褰撳墠鐨勬紡鎹熺疮璁℃祦閲忥紝24鏃朵竴涓懆鏈燂紝0鏃跺綊0)鍗曚綅涓簃3銆� + } } \ No newline at end of file -- Gitblit v1.8.0