From f1208474f771a1c233d7425c8ed13fbaa0d521ac Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期三, 12 三月 2025 09:35:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/5.X' into 5.X

---
 ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/constant/FlowConstant.java |  113 ++++++++++----------------------------------------------
 1 files changed, 21 insertions(+), 92 deletions(-)

diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/constant/FlowConstant.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/constant/FlowConstant.java
index c3fcafa..1b10eb8 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/constant/FlowConstant.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/constant/FlowConstant.java
@@ -8,83 +8,6 @@
  */
 public interface FlowConstant {
 
-    String MESSAGE_CURRENT_TASK_IS_NULL = "褰撳墠浠诲姟涓嶅瓨鍦ㄦ垨浣犱笉鏄换鍔″姙鐞嗕汉锛�";
-
-    String MESSAGE_SUSPENDED = "褰撳墠浠诲姟宸叉寕璧蜂笉鍙鎵癸紒";
-
-    /**
-     * 杩炵嚎
-     */
-    String SEQUENCE_FLOW = "sequenceFlow";
-
-    /**
-     * 骞惰缃戝叧
-     */
-    String PARALLEL_GATEWAY = "parallelGateway";
-
-    /**
-     * 鎺掑畠缃戝叧
-     */
-    String EXCLUSIVE_GATEWAY = "exclusiveGateway";
-
-    /**
-     * 鍖呭惈缃戝叧
-     */
-    String INCLUSIVE_GATEWAY = "inclusiveGateway";
-
-    /**
-     * 缁撴潫鑺傜偣
-     */
-    String END_EVENT = "endEvent";
-
-
-    /**
-     * 娴佺▼濮旀淳鏍囪瘑
-     */
-    String PENDING = "PENDING";
-
-    /**
-     * 鍊欓�変汉鏍囪瘑
-     */
-    String CANDIDATE = "candidate";
-
-    /**
-     * 浼氱浠诲姟鎬绘暟
-     */
-    String NUMBER_OF_INSTANCES = "nrOfInstances";
-
-    /**
-     * 姝ｅ湪鎵ц鐨勪細绛炬�绘暟
-     */
-    String NUMBER_OF_ACTIVE_INSTANCES = "nrOfActiveInstances";
-
-    /**
-     * 宸插畬鎴愮殑浼氱浠诲姟鎬绘暟
-     */
-    String NUMBER_OF_COMPLETED_INSTANCES = "nrOfCompletedInstances";
-
-    /**
-     * 寰幆鐨勭储寮曞�硷紝鍙互浣跨敤elementIndexVariable灞炴�т慨鏀筶oopCounter鐨勫彉閲忓悕
-     */
-    String LOOP_COUNTER = "loopCounter";
-
-    String ZIP = "ZIP";
-
-    /**
-     * 涓氬姟涓庢祦绋嬪疄渚嬪叧鑱斿璞�
-     */
-    String BUSINESS_INSTANCE_DTO = "businessInstanceDTO";
-
-    /**
-     * 娴佺▼瀹氫箟閰嶇疆
-     */
-    String WF_DEFINITION_CONFIG_VO = "wfDefinitionConfigVo";
-
-    /**
-     * 鑺傜偣閰嶇疆
-     */
-    String WF_NODE_CONFIG_VO = "wfNodeConfigVo";
-
     /**
      * 娴佺▼鍙戣捣浜�
      */
@@ -98,40 +21,46 @@
     /**
      * 涓氬姟id
      */
-    String BUSINESS_KEY = "businessKey";
+    String BUSINESS_ID = "businessId";
 
     /**
-     * 娴佺▼瀹氫箟id
+     * 浠诲姟id
      */
-    String PROCESS_DEFINITION_ID = "processDefinitionId";
+    String TASK_ID = "taskId";
 
     /**
-     * 寮�鍚烦杩囪〃杈惧紡鍙橀噺
+     * 濮旀墭
      */
-    String FLOWABLE_SKIP_EXPRESSION_ENABLED = "_FLOWABLE_SKIP_EXPRESSION_ENABLED";
+    String DELEGATE_TASK = "delegateTask";
 
     /**
-     * 妯″瀷鏍囪瘑key鍛藉悕瑙勮寖姝ｅ垯琛ㄨ揪寮�
+     * 杞姙
      */
-    String MODEL_KEY_PATTERN = "^[a-zA-Z][a-zA-Z0-9_]{0,254}$";
+    String TRANSFER_TASK = "transferTask";
 
     /**
-     * 鐢ㄦ埛浠诲姟
+     * 鍔犵
      */
-    String USER_TASK = "userTask";
+    String ADD_SIGNATURE = "addSignature";
 
     /**
-     * 浼氱
+     * 鍑忕
      */
-    String MULTI_INSTANCE = "multiInstance";
+    String REDUCTION_SIGNATURE = "reductionSignature";
 
     /**
-     * 鏄�
+     * 娴佺▼鍒嗙被Id杞悕绉�
      */
-    String TRUE = "0";
+    String CATEGORY_ID_TO_NAME = "category_id_to_name";
 
     /**
-     * 鍚�
+     * 娴佺▼鍒嗙被鍚嶇О
      */
-    String FALSE = "1";
+    String FLOW_CATEGORY_NAME = "flow_category_name#30d";
+
+    /**
+     * 榛樿绉熸埛OA鐢宠鍒嗙被id
+     */
+    Long FLOW_CATEGORY_ID = 100L;
+
 }

--
Gitblit v1.9.3