From 7991bde3aea532f756d223e85af2222b274c4403 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=88=9A=E8=BE=B0=E5=85=88=E7=94=9F?= <qichen111@126.com>
Date: Sun, 8 Dec 2024 17:37:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=AF=E6=AD=A3=E5=B8=B8=E5=90=AF=E5=8A=A8?=
 =?UTF-8?q?=EF=BC=8C=E5=B7=A5=E4=BD=9C=E6=B5=81=E5=8F=AF=E4=BB=A5=E6=AD=A3?=
 =?UTF-8?q?=E5=B8=B8=E8=BF=90=E8=A1=8C=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=BA=86?=
 =?UTF-8?q?=E5=85=B6=E4=BB=96=E8=8A=82=E7=82=B9=EF=BC=8C=E4=BD=86=E6=98=AF?=
 =?UTF-8?q?=E8=BF=98=E6=B2=A1=E8=BF=90=E8=A1=8C=E8=BF=87=EF=BC=8C=E7=BC=96?=
 =?UTF-8?q?=E8=AF=91=E6=97=A0=E9=94=99=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workflow/entity/WorkflowVariable.java     |  4 +++-
 .../workflow/enums/VariableTypeEnum.java      | 22 +++++++++++++++++++
 .../impl/WorkflowVariableServiceImpl.java     | 19 ++++++++++++++++
 3 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 backend/src/main/java/com/qqchen/deploy/backend/workflow/enums/VariableTypeEnum.java

diff --git a/backend/src/main/java/com/qqchen/deploy/backend/workflow/entity/WorkflowVariable.java b/backend/src/main/java/com/qqchen/deploy/backend/workflow/entity/WorkflowVariable.java
index b86a08dc..e32ac16a 100644
--- a/backend/src/main/java/com/qqchen/deploy/backend/workflow/entity/WorkflowVariable.java
+++ b/backend/src/main/java/com/qqchen/deploy/backend/workflow/entity/WorkflowVariable.java
@@ -3,6 +3,7 @@ package com.qqchen.deploy.backend.workflow.entity;
 import com.qqchen.deploy.backend.framework.annotation.LogicDelete;
 import com.qqchen.deploy.backend.framework.domain.Entity;
 import com.qqchen.deploy.backend.workflow.enums.VariableScopeEnum;
+import com.qqchen.deploy.backend.workflow.enums.VariableTypeEnum;
 import jakarta.persistence.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -39,8 +40,9 @@ public class WorkflowVariable extends Entity<Long> {
     /**
      * 变量类型
      */
+    @Enumerated(EnumType.STRING)
     @Column(nullable = false)
-    private String type;
+    private VariableTypeEnum type;
 
     /**
      * 变量作用域
diff --git a/backend/src/main/java/com/qqchen/deploy/backend/workflow/enums/VariableTypeEnum.java b/backend/src/main/java/com/qqchen/deploy/backend/workflow/enums/VariableTypeEnum.java
new file mode 100644
index 00000000..7348ddf7
--- /dev/null
+++ b/backend/src/main/java/com/qqchen/deploy/backend/workflow/enums/VariableTypeEnum.java
@@ -0,0 +1,22 @@
+package com.qqchen.deploy.backend.workflow.enums;
+
+/**
+ * 变量类型枚举
+ */
+public enum VariableTypeEnum {
+    STRING("字符串"),
+    NUMBER("数字"),
+    BOOLEAN("布尔值"),
+    OBJECT("对象"),
+    ARRAY("数组");
+
+    private final String description;
+
+    VariableTypeEnum(String description) {
+        this.description = description;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+}
diff --git a/backend/src/main/java/com/qqchen/deploy/backend/workflow/service/impl/WorkflowVariableServiceImpl.java b/backend/src/main/java/com/qqchen/deploy/backend/workflow/service/impl/WorkflowVariableServiceImpl.java
index f08daf40..0c5b9098 100644
--- a/backend/src/main/java/com/qqchen/deploy/backend/workflow/service/impl/WorkflowVariableServiceImpl.java
+++ b/backend/src/main/java/com/qqchen/deploy/backend/workflow/service/impl/WorkflowVariableServiceImpl.java
@@ -9,6 +9,7 @@ import com.qqchen.deploy.backend.workflow.dto.WorkflowVariableDTO;
 import com.qqchen.deploy.backend.workflow.entity.WorkflowInstance;
 import com.qqchen.deploy.backend.workflow.entity.WorkflowVariable;
 import com.qqchen.deploy.backend.workflow.enums.VariableScopeEnum;
+import com.qqchen.deploy.backend.workflow.enums.VariableTypeEnum;
 import com.qqchen.deploy.backend.workflow.repository.IWorkflowVariableRepository;
 import com.qqchen.deploy.backend.workflow.service.IWorkflowVariableService;
 import jakarta.annotation.Resource;
@@ -47,6 +48,24 @@ public class WorkflowVariableServiceImpl extends BaseServiceImpl<WorkflowVariabl
                 variable.setWorkflowInstance(instance);
                 variable.setName(key);
                 variable.setValue(objectMapper.writeValueAsString(value));
+                
+                // 推断变量类型
+                if (value == null) {
+                    variable.setType(VariableTypeEnum.STRING); // 默认为字符串类型
+                } else if (value instanceof String) {
+                    variable.setType(VariableTypeEnum.STRING);
+                } else if (value instanceof Number) {
+                    variable.setType(VariableTypeEnum.NUMBER);
+                } else if (value instanceof Boolean) {
+                    variable.setType(VariableTypeEnum.BOOLEAN);
+                } else if (value instanceof Map || value.getClass().isRecord()) {
+                    variable.setType(VariableTypeEnum.OBJECT);
+                } else if (value instanceof Iterable || value.getClass().isArray()) {
+                    variable.setType(VariableTypeEnum.ARRAY);
+                } else {
+                    variable.setType(VariableTypeEnum.OBJECT);
+                }
+
                 variableRepository.save(variable);
             } catch (JsonProcessingException e) {
                 throw new BusinessException(ResponseCode.WORKFLOW_VARIABLE_SERIALIZE_ERROR);