From b218f31bb202cffa656fa4ee09bdd8d67f8ed0ef Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期二, 13 五月 2025 17:29:42 +0800 Subject: [PATCH] 1、根据江海调整,功能码92、A2的应答中的日期时间去除; 2、表阀一体机的开关阀上行数据(84、85)处理逻辑进行修改。 --- pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoUnclosedValve.java | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoUnclosedValve.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoUnclosedValve.java index c556bf8..beca40c 100644 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoUnclosedValve.java +++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoUnclosedValve.java @@ -4,6 +4,8 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder; import lombok.Data; +import java.util.Date; + /** * @author ZhuBaoMin * @date 2024-05-24 16:30 @@ -12,7 +14,7 @@ */ @Data -@JsonPropertyOrder({"intakeNum", "isOnLine", "rtuAddr", "vcNum", "orderNo", "state", "planned"}) +@JsonPropertyOrder({"intakeNum", "isOnLine", "rtuAddr", "vcNum", "orderNo", "state", "planned", "dt", "waterInstant"}) public class VoUnclosedValve implements BaseEntity { private static final long serialVersionUID = 202405241634001L; @@ -53,5 +55,13 @@ */ private Boolean planned; - //private Date openTime; + /** + * 宸ヤ綔鎶ユ椂闂� + */ + private Date dt; + + /** + * 鐬椂娴侀噺 + */ + private Double waterInstant; } -- Gitblit v1.8.0