From f79e0db96504cb79e11f7ab1e81b90839d9351bf Mon Sep 17 00:00:00 2001 From: dengqichen Date: Fri, 27 Dec 2024 14:22:10 +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 --- .../qqchen/deploy/backend/deploy/dto/DeployAppConfigDTO.java | 3 +++ .../qqchen/deploy/backend/deploy/entity/DeployAppConfig.java | 3 +++ .../workflow/api/WorkflowDefinitionApiController.java | 5 +++++ .../workflow/repository/IWorkflowDefinitionRepository.java | 4 ++++ .../backend/workflow/service/IWorkflowDefinitionService.java | 2 ++ .../workflow/service/impl/WorkflowDefinitionServiceImpl.java | 5 +++++ 6 files changed, 22 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 710c9b01..6ff610c3 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 @@ -36,6 +36,9 @@ public class DeployAppConfigDTO extends BaseDTO { @NotNull(message = "应用语言不能为空") private DevelopmentLanguageTypeEnum languageType; + @NotNull(message = "已发布的流程定义ID") + private Long workflowDefinitionId; + @Schema(description = "构建配置") @NotNull(message = "构建配置不能为空") private JsonNode buildVariables; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/DeployAppConfig.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/DeployAppConfig.java index 77312d8c..8cc25a12 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/DeployAppConfig.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/DeployAppConfig.java @@ -37,6 +37,9 @@ public class DeployAppConfig extends Entity { @Enumerated(EnumType.STRING) private DevelopmentLanguageTypeEnum languageType; + @Column(name = "workflow_definition_id", nullable = false) + private Long workflowDefinitionId; + @Type(JsonType.class) @Column(name = "build_variables", columnDefinition = "text", nullable = false) private JsonNode buildVariables; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/workflow/api/WorkflowDefinitionApiController.java b/backend/src/main/java/com/qqchen/deploy/backend/workflow/api/WorkflowDefinitionApiController.java index 0e97696c..892b9f53 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/workflow/api/WorkflowDefinitionApiController.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/workflow/api/WorkflowDefinitionApiController.java @@ -52,6 +52,11 @@ public class WorkflowDefinitionApiController extends BaseController> findPublishedWorkflow() { + return Response.success(workflowDefinitionService.findPublishedWorkflow()); + } + @PostMapping("/{workflowDefinitionId}/published") public Response publishedWorkflowDesign(@PathVariable Long workflowDefinitionId) { workflowDefinitionService.publishedWorkflowDesign(workflowDefinitionId); diff --git a/backend/src/main/java/com/qqchen/deploy/backend/workflow/repository/IWorkflowDefinitionRepository.java b/backend/src/main/java/com/qqchen/deploy/backend/workflow/repository/IWorkflowDefinitionRepository.java index 69355dfa..8b6bc71e 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/workflow/repository/IWorkflowDefinitionRepository.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/workflow/repository/IWorkflowDefinitionRepository.java @@ -1,12 +1,14 @@ package com.qqchen.deploy.backend.workflow.repository; import com.qqchen.deploy.backend.framework.repository.IBaseRepository; +import com.qqchen.deploy.backend.workflow.dto.WorkflowDefinitionDTO; import com.qqchen.deploy.backend.workflow.entity.WorkflowDefinition; import com.qqchen.deploy.backend.workflow.enums.WorkflowDefinitionStatusEnums; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Repository; +import java.util.List; import java.util.Optional; /** @@ -27,4 +29,6 @@ public interface IWorkflowDefinitionRepository extends IBaseRepository findByKey(String businessKey); Page findByStatus(WorkflowDefinitionStatusEnums workflowStatusEnums, Pageable pageable); + + List findByStatus(WorkflowDefinitionStatusEnums workflowDefinitionStatusEnums); } diff --git a/backend/src/main/java/com/qqchen/deploy/backend/workflow/service/IWorkflowDefinitionService.java b/backend/src/main/java/com/qqchen/deploy/backend/workflow/service/IWorkflowDefinitionService.java index c9e05041..95e93e0c 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/workflow/service/IWorkflowDefinitionService.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/workflow/service/IWorkflowDefinitionService.java @@ -61,4 +61,6 @@ public interface IWorkflowDefinitionService extends IBaseService getWorkflowCategories(); + + List findPublishedWorkflow(); } diff --git a/backend/src/main/java/com/qqchen/deploy/backend/workflow/service/impl/WorkflowDefinitionServiceImpl.java b/backend/src/main/java/com/qqchen/deploy/backend/workflow/service/impl/WorkflowDefinitionServiceImpl.java index 77b6332d..e954718e 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/workflow/service/impl/WorkflowDefinitionServiceImpl.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/workflow/service/impl/WorkflowDefinitionServiceImpl.java @@ -359,4 +359,9 @@ public class WorkflowDefinitionServiceImpl extends BaseServiceImpl findPublishedWorkflow() { + return workflowDefinitionRepository.findByStatus(WorkflowDefinitionStatusEnums.PUBLISHED); + } + }