diff --git a/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/definition/workflow/WorkflowDefinitionNode.java b/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/definition/workflow/WorkflowDefinitionNode.java index 37c86675..7ed9ccd3 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/definition/workflow/WorkflowDefinitionNode.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/definition/workflow/WorkflowDefinitionNode.java @@ -1,7 +1,6 @@ package com.qqchen.deploy.backend.workflow.dto.definition.workflow; import com.fasterxml.jackson.databind.JsonNode; -import com.qqchen.deploy.backend.workflow.dto.definition.node.uiVariables.NodeUiVariables; import com.qqchen.deploy.backend.workflow.enums.NodeTypeEnums; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -16,26 +15,26 @@ import java.util.Map; */ @Data public class WorkflowDefinitionNode { + /** * 节点ID */ private String id; - /** * 节点Code */ - private String code; + private String nodeCode; /** * 节点类型 */ - private NodeTypeEnums type; + private NodeTypeEnums nodeType; /** * 节点名称 */ - private String name; + private String nodeName; @Schema(description = "节点UI") private JsonNode uiVariables; @@ -46,7 +45,7 @@ public class WorkflowDefinitionNode { @Schema(description = "节点环境变量") private JsonNode localVariables; - @Schema(description = "节点表单") - private JsonNode formVariables; + @Schema(description = "节点表单 JSON SCHEMA") + private JsonNode formVariablesSchema; } 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 87227867..e5a15a6c 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 @@ -71,8 +71,6 @@ public class WorkflowDefinitionServiceImpl extends BaseServiceImpl instanceClass = (Class) NodeTypeEnums.valueOf(node.getCode()) + Class instanceClass = (Class) NodeTypeEnums.valueOf(node.getNodeCode()) .getBpmnType() .getInstance(); @@ -72,7 +72,7 @@ public class BpmnConverter { String validId = sanitizeId(node.getId()); idMapping.put(node.getId(), validId); element.setId(validId); - element.setName(node.getName()); + element.setName(node.getNodeName()); // 设置节点特定属性 configureFlowElement(element, node, process);