From 448350dea2c3ce1abe46807f13f2f65fa7684f80 Mon Sep 17 00:00:00 2001 From: dengqichen Date: Fri, 27 Dec 2024 14:53:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=A3=B0=E9=81=93=E6=92=92=E6=97=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deploy/backend/deploy/dto/DeployAppConfigDTO.java | 5 +++++ .../service/impl/DeployAppConfigServiceImpl.java | 11 +++++++++++ 2 files changed, 16 insertions(+) diff --git a/backend/src/main/java/com/qqchen/deploy/backend/deploy/dto/DeployAppConfigDTO.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/dto/DeployAppConfigDTO.java index 6ff610c3..e43a18c2 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/deploy/dto/DeployAppConfigDTO.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/dto/DeployAppConfigDTO.java @@ -4,6 +4,8 @@ import com.fasterxml.jackson.databind.JsonNode; import com.qqchen.deploy.backend.deploy.enums.BuildTypeEnum; import com.qqchen.deploy.backend.deploy.enums.DevelopmentLanguageTypeEnum; import com.qqchen.deploy.backend.framework.dto.BaseDTO; +import com.qqchen.deploy.backend.workflow.dto.WorkflowDefinitionDTO; +import com.qqchen.deploy.backend.workflow.entity.WorkflowDefinition; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; @@ -39,6 +41,9 @@ public class DeployAppConfigDTO extends BaseDTO { @NotNull(message = "已发布的流程定义ID") private Long workflowDefinitionId; + @Schema(description = "已发布的流程定义") + private WorkflowDefinitionDTO publishedWorkflowDefinition; + @Schema(description = "构建配置") @NotNull(message = "构建配置不能为空") private JsonNode buildVariables; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/DeployAppConfigServiceImpl.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/DeployAppConfigServiceImpl.java index 02c7f332..8ff9ccb7 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/DeployAppConfigServiceImpl.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/DeployAppConfigServiceImpl.java @@ -14,6 +14,9 @@ import com.qqchen.deploy.backend.deploy.query.DeployAppConfigQuery; import com.qqchen.deploy.backend.deploy.repository.IApplicationRepository; import com.qqchen.deploy.backend.deploy.service.IDeployAppConfigService; import com.qqchen.deploy.backend.framework.service.impl.BaseServiceImpl; +import com.qqchen.deploy.backend.workflow.converter.WorkflowDefinitionConverter; +import com.qqchen.deploy.backend.workflow.entity.WorkflowDefinition; +import com.qqchen.deploy.backend.workflow.repository.IWorkflowDefinitionRepository; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.data.domain.Page; @@ -40,12 +43,20 @@ public class DeployAppConfigServiceImpl extends BaseServiceImpl page(DeployAppConfigQuery query) { Page page = super.page(query); List result = page.getContent().stream().peek(deployAppConfig -> { Optional optionalApplication = applicationRepository.findById(deployAppConfig.getApplicationId()); optionalApplication.ifPresent(application -> deployAppConfig.setApplication(applicationConverter.toDto(application))); + Optional optionalWorkflowDefinition = workflowDefinitionRepository.findById(deployAppConfig.getWorkflowDefinitionId()); + optionalWorkflowDefinition.ifPresent(workflowDefinition -> deployAppConfig.setPublishedWorkflowDefinition(workflowDefinitionConverter.toDto(workflowDefinition))); }).collect(toList()); return new PageImpl<>(result, page.getPageable(), page.getTotalElements()); }