ai-coding/deploy-ease-platform
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

大声道撒旦

Browse Source
This commit is contained in:
dengqichen 2024-12-27 14:53:31 +08:00
parent d9cbbe93f1
commit 448350dea2
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
backend/src/main/java/com/qqchen/deploy/backend/deploy/dto/DeployAppConfigDTO.java
View File

@ -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.BuildTypeEnum;
import com.qqchen.deploy.backend.deploy.enums.DevelopmentLanguageTypeEnum; import com.qqchen.deploy.backend.deploy.enums.DevelopmentLanguageTypeEnum;
import com.qqchen.deploy.backend.framework.dto.BaseDTO; 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 io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
@ -39,6 +41,9 @@ public class DeployAppConfigDTO extends BaseDTO {
@NotNull(message = "已发布的流程定义ID") @NotNull(message = "已发布的流程定义ID")
private Long workflowDefinitionId; private Long workflowDefinitionId;
@Schema(description = "已发布的流程定义")
private WorkflowDefinitionDTO publishedWorkflowDefinition;
@Schema(description = "构建配置") @Schema(description = "构建配置")
@NotNull(message = "构建配置不能为空") @NotNull(message = "构建配置不能为空")
private JsonNode buildVariables; private JsonNode buildVariables;

11
backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/DeployAppConfigServiceImpl.java
View File

@ -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.repository.IApplicationRepository;
import com.qqchen.deploy.backend.deploy.service.IDeployAppConfigService; import com.qqchen.deploy.backend.deploy.service.IDeployAppConfigService;
import com.qqchen.deploy.backend.framework.service.impl.BaseServiceImpl; 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 jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
@ -40,12 +43,20 @@ public class DeployAppConfigServiceImpl extends BaseServiceImpl<DeployAppConfig,
@Resource @Resource
private ApplicationConverter applicationConverter; private ApplicationConverter applicationConverter;
@Resource
private IWorkflowDefinitionRepository workflowDefinitionRepository;
@Resource
private WorkflowDefinitionConverter workflowDefinitionConverter;
@Override @Override
public Page<DeployAppConfigDTO> page(DeployAppConfigQuery query) { public Page<DeployAppConfigDTO> page(DeployAppConfigQuery query) {
Page<DeployAppConfigDTO> page = super.page(query); Page<DeployAppConfigDTO> page = super.page(query);
List<DeployAppConfigDTO> result = page.getContent().stream().peek(deployAppConfig -> { List<DeployAppConfigDTO> result = page.getContent().stream().peek(deployAppConfig -> {
Optional<Application> optionalApplication = applicationRepository.findById(deployAppConfig.getApplicationId()); Optional<Application> optionalApplication = applicationRepository.findById(deployAppConfig.getApplicationId());
optionalApplication.ifPresent(application -> deployAppConfig.setApplication(applicationConverter.toDto(application))); optionalApplication.ifPresent(application -> deployAppConfig.setApplication(applicationConverter.toDto(application)));
Optional<WorkflowDefinition> optionalWorkflowDefinition = workflowDefinitionRepository.findById(deployAppConfig.getWorkflowDefinitionId());
optionalWorkflowDefinition.ifPresent(workflowDefinition -> deployAppConfig.setPublishedWorkflowDefinition(workflowDefinitionConverter.toDto(workflowDefinition)));
}).collect(toList()); }).collect(toList());
return new PageImpl<>(result, page.getPageable(), page.getTotalElements()); return new PageImpl<>(result, page.getPageable(), page.getTotalElements());
} }