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-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/WorkflowService.java | 76 +++++++++++++++++++++----------------
1 files changed, 43 insertions(+), 33 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/WorkflowService.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/WorkflowService.java
index 4e556c9..abbcbff 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/WorkflowService.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/WorkflowService.java
@@ -1,5 +1,9 @@
package org.dromara.common.core.service;
+import org.dromara.common.core.domain.dto.CompleteTaskDTO;
+import org.dromara.common.core.domain.dto.StartProcessDTO;
+import org.dromara.common.core.domain.dto.StartProcessReturnDTO;
+
import java.util.List;
import java.util.Map;
@@ -13,64 +17,70 @@
/**
* 杩愯涓殑瀹炰緥 鍒犻櫎绋嬪疄渚嬶紝鍒犻櫎鍘嗗彶璁板綍锛屽垹闄や笟鍔′笌娴佺▼鍏宠仈淇℃伅
*
- * @param businessKeys 涓氬姟id
+ * @param businessIds 涓氬姟id
* @return 缁撴灉
*/
- boolean deleteRunAndHisInstance(List<String> businessKeys);
+ boolean deleteInstance(List<Long> businessIds);
/**
* 鑾峰彇褰撳墠娴佺▼鐘舵��
*
* @param taskId 浠诲姟id
+ * @return 鐘舵��
*/
- String getBusinessStatusByTaskId(String taskId);
+ String getBusinessStatusByTaskId(Long taskId);
/**
* 鑾峰彇褰撳墠娴佺▼鐘舵��
*
- * @param businessKey 涓氬姟id
+ * @param businessId 涓氬姟id
+ * @return 鐘舵��
*/
- String getBusinessStatus(String businessKey);
+ String getBusinessStatus(String businessId);
/**
- * 璁剧疆娴佺▼鍙橀噺(鍏ㄥ眬鍙橀噺)
+ * 璁剧疆娴佺▼鍙橀噺
*
- * @param taskId 浠诲姟id
- * @param variableName 鍙橀噺鍚嶇О
- * @param value 鍙橀噺鍊�
+ * @param instanceId 娴佺▼瀹炰緥id
+ * @param variable 娴佺▼鍙橀噺
*/
- void setVariable(String taskId, String variableName, Object value);
+ void setVariable(Long instanceId, Map<String, Object> variable);
/**
- * 璁剧疆娴佺▼鍙橀噺(鍏ㄥ眬鍙橀噺)
+ * 鑾峰彇娴佺▼鍙橀噺
*
- * @param taskId 浠诲姟id
- * @param variables 娴佺▼鍙橀噺
+ * @param instanceId 娴佺▼瀹炰緥id
*/
- void setVariables(String taskId, Map<String, Object> variables);
-
- /**
- * 璁剧疆娴佺▼鍙橀噺(鏈湴鍙橀噺,闈炲叏灞�鍙橀噺)
- *
- * @param taskId 浠诲姟id
- * @param variableName 鍙橀噺鍚嶇О
- * @param value 鍙橀噺鍊�
- */
- void setVariableLocal(String taskId, String variableName, Object value);
-
- /**
- * 璁剧疆娴佺▼鍙橀噺(鏈湴鍙橀噺,闈炲叏灞�鍙橀噺)
- *
- * @param taskId 浠诲姟id
- * @param variables 娴佺▼鍙橀噺
- */
- void setVariablesLocal(String taskId, Map<String, Object> variables);
+ Map<String, Object> instanceVariable(Long instanceId);
/**
* 鎸夌収涓氬姟id鏌ヨ娴佺▼瀹炰緥id
*
- * @param businessKey 涓氬姟id
+ * @param businessId 涓氬姟id
* @return 缁撴灉
*/
- String getInstanceIdByBusinessKey(String businessKey);
+ Long getInstanceIdByBusinessId(String businessId);
+
+ /**
+ * 鏂板绉熸埛娴佺▼瀹氫箟
+ *
+ * @param tenantId 绉熸埛id
+ */
+ void syncDef(String tenantId);
+
+ /**
+ * 鍚姩娴佺▼
+ *
+ * @param startProcess 鍙傛暟
+ * @return 缁撴灉
+ */
+ StartProcessReturnDTO startWorkFlow(StartProcessDTO startProcess);
+
+ /**
+ * 鍔炵悊浠诲姟
+ *
+ * @param completeTask 鍙傛暟
+ * @return 缁撴灉
+ */
+ boolean completeTask(CompleteTaskDTO completeTask);
}
--
Gitblit v1.9.3