From 098d3347a0df808908aab8c554cd7c4febc5e6d9 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 26 八月 2024 11:43:59 +0800
Subject: [PATCH] !577 发布 5.2.2 正式版 安全性提升 Merge pull request !577 from 疯狂的狮子Li/dev
---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowServiceImpl.java | 70 +++++++++++++++++++++++++++++------
1 files changed, 58 insertions(+), 12 deletions(-)
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowServiceImpl.java
index 91a899d..f75a188 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowServiceImpl.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowServiceImpl.java
@@ -1,12 +1,18 @@
package org.dromara.workflow.service.impl;
+import cn.hutool.core.util.StrUtil;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.service.WorkflowService;
+import org.dromara.workflow.domain.ActHiProcinst;
+import org.dromara.workflow.service.IActHiProcinstService;
import org.dromara.workflow.service.IActProcessInstanceService;
import org.dromara.workflow.utils.WorkflowUtils;
+import org.flowable.engine.RuntimeService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
+import java.util.Map;
/**
* 閫氱敤 宸ヤ綔娴佹湇鍔″疄鐜�
@@ -17,8 +23,10 @@
@Service
public class WorkflowServiceImpl implements WorkflowService {
+ @Autowired(required = false)
+ private RuntimeService runtimeService;
private final IActProcessInstanceService iActProcessInstanceService;
-
+ private final IActHiProcinstService iActHiProcinstService;
/**
* 杩愯涓殑瀹炰緥 鍒犻櫎绋嬪疄渚嬶紝鍒犻櫎鍘嗗彶璁板綍锛屽垹闄や笟鍔′笌娴佺▼鍏宠仈淇℃伅
*
@@ -51,25 +59,63 @@
}
/**
- * 璁剧疆娴佺▼瀹炰緥瀵硅薄
+ * 璁剧疆娴佺▼鍙橀噺(鍏ㄥ眬鍙橀噺)
*
- * @param obj 涓氬姟瀵硅薄
- * @param businessKey 涓氬姟id
+ * @param taskId 浠诲姟id
+ * @param variableName 鍙橀噺鍚嶇О
+ * @param value 鍙橀噺鍊�
*/
@Override
- public void setBusinessInstanceDTO(Object obj, String businessKey) {
- WorkflowUtils.setBusinessInstanceDTO(obj, businessKey);
+ public void setVariable(String taskId, String variableName, Object value) {
+ runtimeService.setVariable(taskId, variableName, value);
}
/**
- * 璁剧疆娴佺▼瀹炰緥瀵硅薄
+ * 璁剧疆娴佺▼鍙橀噺(鍏ㄥ眬鍙橀噺)
*
- * @param obj 涓氬姟瀵硅薄
- * @param idList 涓氬姟id
- * @param fieldName 涓婚敭灞炴�у悕绉�
+ * @param taskId 浠诲姟id
+ * @param variables 娴佺▼鍙橀噺
*/
@Override
- public void setBusinessInstanceListDTO(Object obj, List<String> idList, String fieldName) {
- WorkflowUtils.setBusinessInstanceListDTO(obj, idList, fieldName);
+ public void setVariables(String taskId, Map<String, Object> variables) {
+ runtimeService.setVariables(taskId, variables);
+ }
+
+ /**
+ * 璁剧疆娴佺▼鍙橀噺(鏈湴鍙橀噺,闈炲叏灞�鍙橀噺)
+ *
+ * @param taskId 浠诲姟id
+ * @param variableName 鍙橀噺鍚嶇О
+ * @param value 鍙橀噺鍊�
+ */
+ @Override
+ public void setVariableLocal(String taskId, String variableName, Object value) {
+ runtimeService.setVariableLocal(taskId, variableName, value);
+ }
+
+ /**
+ * 璁剧疆娴佺▼鍙橀噺(鏈湴鍙橀噺,闈炲叏灞�鍙橀噺)
+ *
+ * @param taskId 浠诲姟id
+ * @param variables 娴佺▼鍙橀噺
+ */
+ @Override
+ public void setVariablesLocal(String taskId, Map<String, Object> variables) {
+ runtimeService.setVariablesLocal(taskId, variables);
+ }
+
+ /**
+ * 鎸夌収涓氬姟id鏌ヨ娴佺▼瀹炰緥id
+ *
+ * @param businessKey 涓氬姟id
+ * @return 缁撴灉
+ */
+ @Override
+ public String getInstanceIdByBusinessKey(String businessKey) {
+ ActHiProcinst actHiProcinst = iActHiProcinstService.selectByBusinessKey(businessKey);
+ if (actHiProcinst == null) {
+ return StrUtil.EMPTY;
+ }
+ return actHiProcinst.getId();
}
}
--
Gitblit v1.9.3