From 684e682bcdf6f572025cb5a221c48680acecfe8e Mon Sep 17 00:00:00 2001 From: dengqichen Date: Thu, 19 Dec 2024 18:17:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=8D=E5=BA=8F=E5=88=97=E5=8C=96=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workflow/dto/WorkflowNodeDefinitionDTO.java | 4 ++-- .../workflow/dto/WorkflowNodeTypeDefinedDTO.java | 4 ++++ .../workflow/entity/WorkflowNodeDefinition.java | 6 +++--- .../impl/WorkflowNodeDefinitionServiceImpl.java | 12 +----------- .../resources/db/migration/V1.0.0__init_schema.sql | 4 ++-- 5 files changed, 12 insertions(+), 18 deletions(-) diff --git a/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/WorkflowNodeDefinitionDTO.java b/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/WorkflowNodeDefinitionDTO.java index 0ce79e2d..3d767d09 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/WorkflowNodeDefinitionDTO.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/WorkflowNodeDefinitionDTO.java @@ -43,8 +43,8 @@ public class WorkflowNodeDefinitionDTO extends BaseDTO { private JsonNode localVariablesSchema; @Schema(description = "节点表单") - private JsonNode fromVariablesSchema; + private JsonNode formVariablesSchema; @Schema(description = "是否启用") - private Boolean enabled; + private Boolean enabled = true; } \ No newline at end of file diff --git a/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/WorkflowNodeTypeDefinedDTO.java b/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/WorkflowNodeTypeDefinedDTO.java index ec62610e..d8ba0ee0 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/WorkflowNodeTypeDefinedDTO.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/WorkflowNodeTypeDefinedDTO.java @@ -1,6 +1,7 @@ package com.qqchen.deploy.backend.workflow.dto; import com.fasterxml.jackson.databind.JsonNode; +import com.qqchen.deploy.backend.workflow.enums.NodeCategoryEnums; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -17,6 +18,9 @@ public class WorkflowNodeTypeDefinedDTO { @Schema(description = "节点名称") private String nodeName; + @Schema(description = "节点分类") + private NodeCategoryEnums category; + @Schema(description = "节点属性变量JSON SCHEMA") private JsonNode panelVariablesSchema; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/workflow/entity/WorkflowNodeDefinition.java b/backend/src/main/java/com/qqchen/deploy/backend/workflow/entity/WorkflowNodeDefinition.java index 931c0ceb..3bc3b99e 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/workflow/entity/WorkflowNodeDefinition.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/workflow/entity/WorkflowNodeDefinition.java @@ -34,7 +34,7 @@ public class WorkflowNodeDefinition extends Entity { private String description; @Enumerated(EnumType.STRING) - @Column(nullable = false) + @Column(name = "category") private NodeCategoryEnums category; @@ -51,8 +51,8 @@ public class WorkflowNodeDefinition extends Entity { private JsonNode localVariablesSchema; @Type(JsonType.class) - @Column(name = "from_variables_schema", columnDefinition = "text", nullable = false) - private JsonNode fromVariablesSchema; + @Column(name = "form_variables_schema", columnDefinition = "text", nullable = false) + private JsonNode formVariablesSchema; @Column(nullable = false) private Boolean enabled = true; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/workflow/service/impl/WorkflowNodeDefinitionServiceImpl.java b/backend/src/main/java/com/qqchen/deploy/backend/workflow/service/impl/WorkflowNodeDefinitionServiceImpl.java index ebf72410..81ee6566 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/workflow/service/impl/WorkflowNodeDefinitionServiceImpl.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/workflow/service/impl/WorkflowNodeDefinitionServiceImpl.java @@ -37,17 +37,6 @@ public class WorkflowNodeDefinitionServiceImpl extends BaseServiceImpl panelVariables = nodeType.getPanelVariables(); if (panelVariables != null) { definedDTO.setPanelVariablesSchema(generateSchema(panelVariables)); diff --git a/backend/src/main/resources/db/migration/V1.0.0__init_schema.sql b/backend/src/main/resources/db/migration/V1.0.0__init_schema.sql index 37d2ce25..450f0444 100644 --- a/backend/src/main/resources/db/migration/V1.0.0__init_schema.sql +++ b/backend/src/main/resources/db/migration/V1.0.0__init_schema.sql @@ -445,11 +445,11 @@ CREATE TABLE workflow_node_definition node_code VARCHAR(50) NOT NULL COMMENT '节点编码', node_name VARCHAR(100) NOT NULL COMMENT '节点名称', description VARCHAR(500) COMMENT '节点描述', - category VARCHAR(50) NOT NULL COMMENT '节点分类', + category VARCHAR(50) COMMENT '节点分类', ui_variables JSON NOT NULL COMMENT '节点UI', panel_variables_schema JSON NOT NULL COMMENT '节点属性', local_variables_schema JSON NOT NULL COMMENT '节点环境变量', - from_variables_schema JSON COMMENT '节点表单', + form_variables_schema JSON COMMENT '节点表单', enabled BOOLEAN NOT NULL DEFAULT TRUE COMMENT '是否启用', create_time DATETIME NOT NULL COMMENT '创建时间',