From 253b1064541c9956a1cb6ee0d0b48fa651ecbfd3 Mon Sep 17 00:00:00 2001
From: dengqichen <dengqichen@iscmtech.com>
Date: Fri, 20 Dec 2024 17:03:56 +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

---
 .../definition/workflow/WorkflowDefinitionNode.java | 13 ++++++-------
 .../service/impl/WorkflowDefinitionServiceImpl.java |  2 --
 .../deploy/backend/workflow/util/BpmnConverter.java |  6 +++---
 3 files changed, 9 insertions(+), 12 deletions(-)

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<WorkflowDefin
     @Resource
     private BpmnConverter bpmnConverter;
 
-    @Resource
-    private IWorkflowInstanceService workflowInstanceService;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
diff --git a/backend/src/main/java/com/qqchen/deploy/backend/workflow/util/BpmnConverter.java b/backend/src/main/java/com/qqchen/deploy/backend/workflow/util/BpmnConverter.java
index 8315c1f4..3f35a343 100644
--- a/backend/src/main/java/com/qqchen/deploy/backend/workflow/util/BpmnConverter.java
+++ b/backend/src/main/java/com/qqchen/deploy/backend/workflow/util/BpmnConverter.java
@@ -59,11 +59,11 @@ public class BpmnConverter {
 
             // 转换节点
             for (WorkflowDefinitionNode node : graph.getNodes()) {
-                log.debug("转换节点: {}, 类型: {}", node.getName(), node.getCode());
+                log.debug("转换节点: {}, 类型: {}", node.getNodeName(), node.getNodeCode());
 
                 // 通过NodeTypeEnums获取对应的BpmnTypeEnums中定义的实例类型
                 @SuppressWarnings("unchecked")
-                Class<? extends FlowElement> instanceClass = (Class<? extends FlowElement>) NodeTypeEnums.valueOf(node.getCode())
+                Class<? extends FlowElement> instanceClass = (Class<? extends FlowElement>) 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);