From 17ce1e65382f560fdf0bc62578894e79cd6c8073 Mon Sep 17 00:00:00 2001
From: dengqichen <dengqichen@iscmtech.com>
Date: Wed, 11 Dec 2024 14:42:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=8A=82=E7=82=B9=E9=9D=A2?=
 =?UTF-8?q?=E6=9D=BF=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../backend/workflow/dto/WorkflowDefinitionDTO.java |  6 +++++-
 .../workflow/dto/WorkflowNodeDefinitionDTO.java     |  7 ++++---
 .../workflow/entity/WorkflowNodeDefinition.java     | 13 ++++++++++---
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/WorkflowDefinitionDTO.java b/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/WorkflowDefinitionDTO.java
index 242ba3d5..f476f6ff 100644
--- a/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/WorkflowDefinitionDTO.java
+++ b/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/WorkflowDefinitionDTO.java
@@ -33,7 +33,11 @@ public class WorkflowDefinitionDTO extends BaseDTO {
      */
     private String bpmnXml;
 
-    private JsonNode graphJson;
+    private JsonNode graphConfig;
+
+    private JsonNode flowableConfig;
+
+    private JsonNode formConfig;
 
     private WorkflowStatusEnums status;
     
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 7f10abd6..da07193b 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
@@ -1,5 +1,6 @@
 package com.qqchen.deploy.backend.workflow.dto;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import com.qqchen.deploy.backend.framework.dto.BaseDTO;
 import com.qqchen.deploy.backend.workflow.enums.NodeCategoryEnums;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -27,13 +28,13 @@ public class WorkflowNodeDefinitionDTO extends BaseDTO {
     private NodeCategoryEnums category;
     
     @Schema(description = "Flowable配置JSON")
-    private String flowableConfig;
+    private JsonNode flowableConfig;
     
     @Schema(description = "X6图形配置JSON")
-    private String graphConfig;
+    private JsonNode graphConfig;
     
     @Schema(description = "表单配置JSON")
-    private String formConfig;
+    private JsonNode formConfig;
     
     @Schema(description = "排序号")
     private Integer orderNum;
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 d08cd836..4db64f56 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
@@ -1,14 +1,17 @@
 package com.qqchen.deploy.backend.workflow.entity;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import com.qqchen.deploy.backend.framework.annotation.LogicDelete;
 import com.qqchen.deploy.backend.framework.domain.Entity;
 import com.qqchen.deploy.backend.workflow.enums.NodeCategoryEnums;
+import com.vladmihalcea.hibernate.type.json.JsonType;
 import jakarta.persistence.Column;
 import jakarta.persistence.EnumType;
 import jakarta.persistence.Enumerated;
 import jakarta.persistence.Table;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.Type;
 
 /**
  * 工作流节点定义
@@ -55,8 +58,9 @@ public class WorkflowNodeDefinition extends Entity<Long> {
      * - listeners: 监听器配置
      * - 其他 Flowable 特定配置
      */
+    @Type(JsonType.class)
     @Column(columnDefinition = "text")
-    private String flowableConfig;
+    private JsonNode flowableConfig;
 
     /**
      * X6 图形配置 JSON
@@ -69,8 +73,9 @@ public class WorkflowNodeDefinition extends Entity<Long> {
      * - color: 颜色
      * - 其他 X6 特定配置
      */
+    @Type(JsonType.class)
     @Column(columnDefinition = "text", nullable = false)
-    private String graphConfig;
+    private JsonNode graphConfig;
 
     /**
      * 表单配置 JSON
@@ -80,12 +85,14 @@ public class WorkflowNodeDefinition extends Entity<Long> {
      * - 业务属性（具体节点类型的特定属性）
      * - 表单验证规则
      */
+    @Type(JsonType.class)
     @Column(columnDefinition = "text")
-    private String formConfig;
+    private JsonNode formConfig;
 
     /**
      * 排序号
      */
+    @Type(JsonType.class)
     @Column(nullable = false)
     private Integer orderNum = 0;