From 1157c9c0eca6484e197aaeb941ac7ce572a5cc03 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期三, 05 二月 2025 11:25:51 +0800 Subject: [PATCH] 取水口综合信息:监控数据信息,统计数据信息 --- pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/VoAllRound/VoArIntakeRemote.java | 43 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 42 insertions(+), 1 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/VoAllRound/VoArIntakeRemote.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/VoAllRound/VoArIntakeRemote.java index a19d9be..f3419b5 100644 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/VoAllRound/VoArIntakeRemote.java +++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/VoAllRound/VoArIntakeRemote.java @@ -2,11 +2,17 @@ import com.alibaba.fastjson2.annotation.JSONField; import com.alibaba.fastjson2.writer.ObjectWriterImplToString; +import com.dy.pipIrrGlobal.voRm.VoLossDay; +import com.dy.pipIrrGlobal.voRm.VoOpenCloseValve; +import com.dy.pipIrrGlobal.voSt.VoDayIntakeAmount; +import com.dy.pipIrrGlobal.voSt.VoDayLoss; +import com.dy.pipIrrGlobal.voSt.VoMonthAmount; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import lombok.Data; import java.util.Date; +import java.util.List; /** * @Author: liurunyu @@ -14,7 +20,7 @@ * @Description */ @Data -@JsonPropertyOrder({"id", "onLine", "alarm", "alarmDt", "lastOpenDt", "lastCloseDt"}) +@JsonPropertyOrder({"id", "onLine", "alarm", "alarmDt", "lastOpenDt", "lastCloseDt", "lossAmount", "lossDt"}) public class VoArIntakeRemote { private static final long serialVersionUID = 202501141703001L; @@ -49,5 +55,40 @@ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") public Date lastCloseDt ; + /** + * 鏈�鍚庣粺璁℃紡鎹熼噺 + */ + public Double lossAmount ; + + /** + * 鏈�鍚庣粺璁℃紡鎹熸棩鏈� + */ + @JsonFormat(pattern = "yyyy-MM-dd") + public Date lossDt ; + + /** + * 寮�鍏抽榾璁板綍 + */ + public List<VoOpenCloseValve> openCloseRecords ; + + /** + * 鏃ユ紡鎹熻褰� + */ + public List<VoDayLoss> lossDayRecords ; + + /** + * 鏈堟紡鎹熻褰� + */ + public List<VoMonthAmount> lossMonthRecords ; + + /** + * 鏃ョ敤姘寸粺璁¤褰� + */ + public List<VoDayIntakeAmount> amountDayRecords ; + + /** + * 鏈堢敤姘寸粺璁¤褰� + */ + public List<VoMonthAmount> amountMonthRecords ; } -- Gitblit v1.8.0