From 0933f0fbbb9e3d61a5043bc93c11e1ec8f7d3f02 Mon Sep 17 00:00:00 2001 From: yangzhe123 <2824096059@qq.com> Date: Thu, 29 Jan 2026 17:47:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=AE=A1=E7=90=86=E5=85=A8?= =?UTF-8?q?=E5=91=A8=E6=9C=9F=EF=BC=8C=E6=96=87=E4=BB=B6ID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gunshi/project/ss/entity/vo/WholeCycleVo.java | 9 +++++++++ .../java/com/gunshi/project/ss/model/ResPlanB.java | 2 +- .../project/ss/service/WholeCycleService.java | 13 ++++++++++++- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gunshi/project/ss/entity/vo/WholeCycleVo.java b/src/main/java/com/gunshi/project/ss/entity/vo/WholeCycleVo.java index c153761..27c7047 100644 --- a/src/main/java/com/gunshi/project/ss/entity/vo/WholeCycleVo.java +++ b/src/main/java/com/gunshi/project/ss/entity/vo/WholeCycleVo.java @@ -11,6 +11,7 @@ import jakarta.validation.constraints.NotNull; import lombok.Data; import java.util.Date; +import java.util.List; @Data public class WholeCycleVo { @@ -43,10 +44,18 @@ public class WholeCycleVo { @JsonFormat(pattern = DateFormatString.YYYY_MM_DD, timezone = "GMT+8") private Date dispatchTime; + @Schema(description = "调度规程文件Id集合") + private List dispatchFileIds; + + @Schema(description = "应急预案文件Id集合") + private List emergencyFileIds; + + @Schema(description="应急预案") // @Size(max = 0,message = "批复时间最大长度要小于 0") @JsonFormat(pattern = DateFormatString.YYYY_MM_DD, timezone = "GMT+8") private Date emergencyTime; + } diff --git a/src/main/java/com/gunshi/project/ss/model/ResPlanB.java b/src/main/java/com/gunshi/project/ss/model/ResPlanB.java index d6959a8..eef5323 100644 --- a/src/main/java/com/gunshi/project/ss/model/ResPlanB.java +++ b/src/main/java/com/gunshi/project/ss/model/ResPlanB.java @@ -121,7 +121,7 @@ public class ResPlanB implements Serializable { @TableField(value = "is_available") @Schema(description = "是否有效 0 无效 1有效") - private Integer isAvailable; + private Integer isAvailable = 1; @TableField(exist = false) diff --git a/src/main/java/com/gunshi/project/ss/service/WholeCycleService.java b/src/main/java/com/gunshi/project/ss/service/WholeCycleService.java index fe3e7c4..6864ca5 100644 --- a/src/main/java/com/gunshi/project/ss/service/WholeCycleService.java +++ b/src/main/java/com/gunshi/project/ss/service/WholeCycleService.java @@ -7,6 +7,9 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; +import java.util.stream.Collectors; + @Service @Slf4j public class WholeCycleService { @@ -26,6 +29,9 @@ public class WholeCycleService { @Autowired private ResPlanBService resPlanBService;//type 1 防汛预案 type2 调度规程 + @Autowired + private FileAssociationsService fileService; + public WholeCycleVo get() { WholeCycleVo res = new WholeCycleVo(); @@ -77,7 +83,9 @@ public class WholeCycleService { }else{ res.setDispatchTime(dispatcher.getPrepTime()); } - + List dispatcherFile = fileService.getFiles("ResPlanB", dispatcher.getId().toString()); + List dispatcherIds = dispatcherFile.stream().map(o -> o.getFileId()).collect(Collectors.toList()); + res.setDispatchFileIds(dispatcherIds); //应急预案 ResPlanB emergency = resPlanBService.lambdaQuery().eq(ResPlanB::getType, 1).eq(ResPlanB::getIsAvailable, 1).orderByDesc(ResPlanB::getPrepTime).last("limit 1").one(); if(emergency == null){ @@ -85,6 +93,9 @@ public class WholeCycleService { }else{ res.setEmergencyTime(emergency.getPrepTime()); } + List emergencyFile = fileService.getFiles("ResPlanB", emergency.getId().toString()); + List emergencyFileIds = emergencyFile.stream().map(o -> o.getFileId()).collect(Collectors.toList()); + res.setEmergencyFileIds(emergencyFileIds); return res; } }