From 725175d06921d6bc49de98776d3975c9b34aead9 Mon Sep 17 00:00:00 2001 From: dengqichen Date: Mon, 30 Dec 2024 15:54:53 +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/query/RepositoryGroupQuery.java | 15 +-------------- .../repository/IRepositoryBranchRepository.java | 9 +-------- .../repository/IRepositoryProjectRepository.java | 9 +-------- .../IRepositorySyncHistoryRepository.java | 3 +-- .../workflow/annotation/SchemaProperty.java | 5 +++++ .../workflow/delegate/BaseNodeDelegate.java | 5 +++++ .../localVariables/DeployNodeLocalVariables.java | 7 ------- .../localVariables/GatewayNodeLocalVariables.java | 7 ------- .../NotificationNodeLocalVariables.java | 7 ------- .../localVariables/ScriptNodeLocalVariables.java | 7 ------- .../panelVariables/BaseNodePanelVariables.java | 9 +++++---- .../panelVariables/DeployNodePanelVariables.java | 10 ++++++++++ .../panelVariables/GatewayNodePanelVariables.java | 12 +++++++++++- .../NotificationNodePanelVariables.java | 9 +++++++++ .../panelVariables/ScriptNodePanelVariables.java | 9 +++++++++ .../workflow/util/GenerateSchemaUtils.java | 3 +++ 16 files changed, 61 insertions(+), 65 deletions(-) diff --git a/backend/src/main/java/com/qqchen/deploy/backend/deploy/query/RepositoryGroupQuery.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/query/RepositoryGroupQuery.java index a0f6dbf5..d4bb0519 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/deploy/query/RepositoryGroupQuery.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/query/RepositoryGroupQuery.java @@ -5,6 +5,7 @@ import com.qqchen.deploy.backend.framework.enums.QueryType; import com.qqchen.deploy.backend.framework.query.BaseQuery; import lombok.Data; import lombok.EqualsAndHashCode; + import java.time.LocalDateTime; /** @@ -65,19 +66,5 @@ public class RepositoryGroupQuery extends BaseQuery { @QueryField(field = "visibility", type = QueryType.LIKE) private String visibility; - /** - * 排序号 - */ - @QueryField(field = "sort") - private Integer sort; - - @QueryField(field = "enabled") - private Boolean enabled; - - /** - * 外部系统下路径唯一 - */ - @QueryField(field = "path)", type = QueryType.LIKE) - private String path); } \ No newline at end of file diff --git a/backend/src/main/java/com/qqchen/deploy/backend/deploy/repository/IRepositoryBranchRepository.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/repository/IRepositoryBranchRepository.java index 7eb51ebd..cb6cde54 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/deploy/repository/IRepositoryBranchRepository.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/repository/IRepositoryBranchRepository.java @@ -12,11 +12,4 @@ import java.util.Optional; @Repository public interface IRepositoryBranchRepository extends IBaseRepository { - @Modifying - @Transactional - void deleteByExternalSystemId(Long externalSystemId); - - Optional findByExternalSystemIdAndProjectIdAndName(Long externalSystemId, Long projectId, String name); - - List findByExternalSystemIdAndProjectIdAndDeletedFalse(Long externalSystemId, Long projectId); -} \ No newline at end of file +} \ No newline at end of file diff --git a/backend/src/main/java/com/qqchen/deploy/backend/deploy/repository/IRepositoryProjectRepository.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/repository/IRepositoryProjectRepository.java index b50888b6..a664a4e1 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/deploy/repository/IRepositoryProjectRepository.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/repository/IRepositoryProjectRepository.java @@ -12,11 +12,4 @@ import java.util.Optional; @Repository public interface IRepositoryProjectRepository extends IBaseRepository { - @Modifying - @Transactional - void deleteByExternalSystemId(Long externalSystemId); - - Optional findByExternalSystemIdAndProjectId(Long externalSystemId, Long projectId); - - List findByExternalSystemIdAndGroupIdAndDeletedFalseOrderBySortAsc(Long externalSystemId, Long groupId); -} \ No newline at end of file +} \ No newline at end of file diff --git a/backend/src/main/java/com/qqchen/deploy/backend/deploy/repository/IRepositorySyncHistoryRepository.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/repository/IRepositorySyncHistoryRepository.java index 2bc60989..54c3e75f 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/deploy/repository/IRepositorySyncHistoryRepository.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/repository/IRepositorySyncHistoryRepository.java @@ -9,5 +9,4 @@ import java.util.List; @Repository public interface IRepositorySyncHistoryRepository extends IBaseRepository { - List findTop50ByOrderByStartTimeDesc(); -} \ No newline at end of file +} \ No newline at end of file diff --git a/backend/src/main/java/com/qqchen/deploy/backend/workflow/annotation/SchemaProperty.java b/backend/src/main/java/com/qqchen/deploy/backend/workflow/annotation/SchemaProperty.java index c12d2309..952598b8 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/workflow/annotation/SchemaProperty.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/workflow/annotation/SchemaProperty.java @@ -103,4 +103,9 @@ public @interface SchemaProperty { * 代码编辑器配置，用于配置Monaco Editor等代码编辑器的行为 */ CodeEditorConfig codeEditor() default @CodeEditorConfig; + + /** + * 是否只读 + */ + boolean readOnly() default false; } diff --git a/backend/src/main/java/com/qqchen/deploy/backend/workflow/delegate/BaseNodeDelegate.java b/backend/src/main/java/com/qqchen/deploy/backend/workflow/delegate/BaseNodeDelegate.java index 49c3fb17..0540becb 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/workflow/delegate/BaseNodeDelegate.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/workflow/delegate/BaseNodeDelegate.java @@ -23,6 +23,11 @@ import java.util.Optional; * * @param

Panel变量类型 * @param Local变量类型 + *

+ *

+ * panelVariables: 节点配置，一次配置长期有效 + * localVariables: 运行时变量，每次执行都会变化 + * fromVariables: 表单输入，每次执行需要用户填写 */ @Slf4j public abstract class BaseNodeDelegate implements JavaDelegate { diff --git a/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/definition/node/localVariables/DeployNodeLocalVariables.java b/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/definition/node/localVariables/DeployNodeLocalVariables.java index 74deb307..a8278684 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/definition/node/localVariables/DeployNodeLocalVariables.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/definition/node/localVariables/DeployNodeLocalVariables.java @@ -8,12 +8,5 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) public class DeployNodeLocalVariables extends BaseNodeLocalVariables { - @SchemaProperty( - title = "委派者", - description = "委派者", - defaultValue = "${deployNodeDelegate}", - required = true - ) - private String delegate; } diff --git a/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/definition/node/localVariables/GatewayNodeLocalVariables.java b/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/definition/node/localVariables/GatewayNodeLocalVariables.java index a4283c37..2fa3b5e3 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/definition/node/localVariables/GatewayNodeLocalVariables.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/definition/node/localVariables/GatewayNodeLocalVariables.java @@ -8,12 +8,5 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) public class GatewayNodeLocalVariables extends BaseNodeLocalVariables { - @SchemaProperty( - title = "委派者", - description = "委派者", - defaultValue = "${gatewayNodeDelegate}", - required = true - ) - private String delegate; } \ No newline at end of file diff --git a/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/definition/node/localVariables/NotificationNodeLocalVariables.java b/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/definition/node/localVariables/NotificationNodeLocalVariables.java index 44c922ab..8d56167a 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/definition/node/localVariables/NotificationNodeLocalVariables.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/definition/node/localVariables/NotificationNodeLocalVariables.java @@ -8,12 +8,5 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) public class NotificationNodeLocalVariables extends BaseNodeLocalVariables { - @SchemaProperty( - title = "委派者", - description = "委派者", - defaultValue = "${notificationNodeDelegate}", - required = true - ) - private String delegate; } diff --git a/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/definition/node/localVariables/ScriptNodeLocalVariables.java b/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/definition/node/localVariables/ScriptNodeLocalVariables.java index 0ec57e95..fc52edb6 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/definition/node/localVariables/ScriptNodeLocalVariables.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/definition/node/localVariables/ScriptNodeLocalVariables.java @@ -8,12 +8,5 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) public class ScriptNodeLocalVariables extends BaseNodeLocalVariables { - @SchemaProperty( - title = "委派者", - description = "委派者", - defaultValue = "${shellNodeDelegate}", - required = true - ) - private String delegate; } diff --git a/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/definition/node/panelVariables/BaseNodePanelVariables.java b/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/definition/node/panelVariables/BaseNodePanelVariables.java index f193768d..0ba6e89b 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/definition/node/panelVariables/BaseNodePanelVariables.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/definition/node/panelVariables/BaseNodePanelVariables.java @@ -9,11 +9,12 @@ import lombok.Data; @Data public class BaseNodePanelVariables { + @SchemaProperty( title = "节点编码", description = "工作流节点的编码", required = true, - order = 1 + order = 2 ) private String code; @@ -24,17 +25,17 @@ public class BaseNodePanelVariables { title = "节点名称", description = "工作流节点的显示名称", required = true, - order = 2 + order = 3 ) private String name; - + /** * 节点描述 */ @SchemaProperty( title = "节点描述", description = "工作流节点的详细描述", - order = 3 + order = 4 ) private String description; } diff --git a/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/definition/node/panelVariables/DeployNodePanelVariables.java b/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/definition/node/panelVariables/DeployNodePanelVariables.java index ab2a6a61..93aafcf3 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/definition/node/panelVariables/DeployNodePanelVariables.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/definition/node/panelVariables/DeployNodePanelVariables.java @@ -1,5 +1,6 @@ package com.qqchen.deploy.backend.workflow.dto.definition.node.panelVariables; +import com.qqchen.deploy.backend.workflow.annotation.SchemaProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -11,4 +12,13 @@ import lombok.EqualsAndHashCode; public class DeployNodePanelVariables extends BaseNodePanelVariables { + @SchemaProperty( + title = "委派者", + description = "委派者", + defaultValue = "${deployNodeDelegate}", + readOnly = true, + order = 1 + ) + private String delegate; + } diff --git a/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/definition/node/panelVariables/GatewayNodePanelVariables.java b/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/definition/node/panelVariables/GatewayNodePanelVariables.java index 00d658b9..c219ba26 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/definition/node/panelVariables/GatewayNodePanelVariables.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/definition/node/panelVariables/GatewayNodePanelVariables.java @@ -10,6 +10,15 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) public class GatewayNodePanelVariables extends BaseNodePanelVariables { + @SchemaProperty( + title = "委派者", + description = "委派者", + defaultValue = "${gatewayNodeDelegate}", + readOnly = true, + order = 1 + ) + private String delegate; + @SchemaProperty( title = "网关类型", description = "网关类型", @@ -24,7 +33,8 @@ public class GatewayNodePanelVariables extends BaseNodePanelVariables { "并行网关", "包容网关" }, - defaultValue = "exclusiveGateway" + defaultValue = "exclusiveGateway", + order = 5 ) private String gatewayType; } \ No newline at end of file diff --git a/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/definition/node/panelVariables/NotificationNodePanelVariables.java b/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/definition/node/panelVariables/NotificationNodePanelVariables.java index 3744a62f..5f759333 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/definition/node/panelVariables/NotificationNodePanelVariables.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/definition/node/panelVariables/NotificationNodePanelVariables.java @@ -11,6 +11,15 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) public class NotificationNodePanelVariables extends BaseNodePanelVariables { + @SchemaProperty( + title = "委派者", + description = "委派者", + defaultValue = "${notificationNodeDelegate}", + required = true, + readOnly = true, + order = 1 + ) + private String delegate; @SchemaProperty( title = "测试输出", diff --git a/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/definition/node/panelVariables/ScriptNodePanelVariables.java b/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/definition/node/panelVariables/ScriptNodePanelVariables.java index 0b98ef69..5869d691 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/definition/node/panelVariables/ScriptNodePanelVariables.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/definition/node/panelVariables/ScriptNodePanelVariables.java @@ -14,6 +14,15 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) public class ScriptNodePanelVariables extends BaseNodePanelVariables { + @SchemaProperty( + title = "委派者", + description = "委派者", + defaultValue = "${shellNodeDelegate}", + required = true, + readOnly = true, + order = 1 + ) + private String delegate; /** * 脚本语言 diff --git a/backend/src/main/java/com/qqchen/deploy/backend/workflow/util/GenerateSchemaUtils.java b/backend/src/main/java/com/qqchen/deploy/backend/workflow/util/GenerateSchemaUtils.java index c8b1d970..6c67554c 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/workflow/util/GenerateSchemaUtils.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/workflow/util/GenerateSchemaUtils.java @@ -61,6 +61,9 @@ public class GenerateSchemaUtils { if (!annotation.description().isEmpty()) { property.put("description", annotation.description()); } + if (annotation.readOnly()) { + property.put("readOnly", true); + } if (!annotation.format().isEmpty()) { property.put("format", annotation.format());