From d9765e031e100e1d8eea34e086cb9c81766e1a00 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期五, 21 二月 2025 09:52:14 +0800 Subject: [PATCH] 针对王江海制定的协议: 1、优化相关注释; 2、优化代码; 3、协议中报警信息有变化:外门报警改为电池电压报警、增加阀门开关状态、增加阀门堵转报警等。 --- pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoCumulativeFlow.java | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoCumulativeFlow.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoCumulativeFlow.java index 74cfe54..66728dc 100644 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoCumulativeFlow.java +++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoCumulativeFlow.java @@ -1,7 +1,9 @@ package com.dy.pipIrrGlobal.voSt; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; import lombok.Data; +import lombok.EqualsAndHashCode; import java.util.Date; @@ -13,16 +15,20 @@ */ @Data +@JsonPropertyOrder({ "intakeId", "intakeNum", "blockName", "lng", "lat" + ,"cumulativeFlow" , "getDate" +}) +@EqualsAndHashCode(callSuper=false) public class VoCumulativeFlow extends VoIntake { /** * 绱娴侀噺 */ - private Double cumulativeFlow; + public Double cumulativeFlow; /** * 鏁版嵁鑾峰彇鏃ユ湡 */ @JsonFormat(pattern = "yyyy-MM-dd") - private Date getDate; + public Date getDate; } -- Gitblit v1.8.0