From b4e1e32d207b61da05d738c68494daa4fc7f18c7 Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: 星期六, 09 三月 2024 13:40:41 +0800
Subject: [PATCH] add 添加查询流程变量接口
---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActTaskController.java | 12 ++++++
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/constant/FlowConstant.java | 10 +++++
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java | 30 +++++++++++++--
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActTaskService.java | 10 +++++
4 files changed, 58 insertions(+), 4 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 614f9ff..1e9d79b 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
@@ -81,6 +81,16 @@
String INITIATOR = "initiator";
/**
+ * 娴佺▼瀹炰緥id
+ */
+ String PROCESS_INSTANCE_ID = "processInstanceId";
+
+ /**
+ * 涓氬姟id
+ */
+ String BUSINESS_KEY = "businessKey";
+
+ /**
* 寮�鍚烦杩囪〃杈惧紡鍙橀噺
*/
String FLOWABLE_SKIP_EXPRESSION_ENABLED = "_FLOWABLE_SKIP_EXPRESSION_ENABLED";
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActTaskController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActTaskController.java
index f84f1db..06727f2 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActTaskController.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActTaskController.java
@@ -14,6 +14,7 @@
import org.dromara.common.web.core.BaseController;
import org.dromara.workflow.domain.bo.*;
import org.dromara.workflow.domain.vo.TaskVo;
+import org.dromara.workflow.domain.vo.VariableVo;
import org.dromara.workflow.service.IActTaskService;
import org.dromara.workflow.utils.QueryUtils;
import org.dromara.workflow.utils.WorkflowUtils;
@@ -21,6 +22,7 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import java.util.List;
import java.util.Map;
/**
@@ -245,4 +247,14 @@
public R<Void> updateAssignee(@PathVariable String[] taskIds, @PathVariable String userId) {
return toAjax(actTaskService.updateAssignee(taskIds, userId));
}
+
+ /**
+ * 鏌ヨ娴佺▼鍙橀噺
+ *
+ * @param taskId 浠诲姟id
+ */
+ @GetMapping("/getInstanceVariable/{taskId}")
+ public R<List<VariableVo>> getProcessInstVariable(@PathVariable String taskId) {
+ return R.ok(actTaskService.getInstanceVariable(taskId));
+ }
}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActTaskService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActTaskService.java
index a40c3d7..45c3de2 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActTaskService.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActTaskService.java
@@ -4,7 +4,9 @@
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.workflow.domain.bo.*;
import org.dromara.workflow.domain.vo.TaskVo;
+import org.dromara.workflow.domain.vo.VariableVo;
+import java.util.List;
import java.util.Map;
/**
@@ -132,4 +134,12 @@
* @return 缁撴灉
*/
boolean updateAssignee(String[] taskIds, String userId);
+
+ /**
+ * 鏌ヨ娴佺▼鍙橀噺
+ *
+ * @param taskId 浠诲姟id
+ * @return 缁撴灉
+ */
+ List<VariableVo> getInstanceVariable(String taskId);
}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java
index 9b60f34..8890279 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java
@@ -23,6 +23,7 @@
import org.dromara.workflow.domain.bo.*;
import org.dromara.workflow.domain.vo.MultiInstanceVo;
import org.dromara.workflow.domain.vo.TaskVo;
+import org.dromara.workflow.domain.vo.VariableVo;
import org.dromara.workflow.domain.vo.WfCopy;
import org.dromara.workflow.flowable.cmd.*;
import org.dromara.workflow.flowable.strategy.FlowEventStrategy;
@@ -46,6 +47,7 @@
import org.flowable.task.api.history.HistoricTaskInstance;
import org.flowable.task.api.history.HistoricTaskInstanceQuery;
import org.flowable.task.service.impl.persistence.entity.TaskEntity;
+import org.flowable.variable.api.persistence.entity.VariableInstance;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -53,8 +55,7 @@
import java.util.*;
import java.util.stream.Collectors;
-import static org.dromara.workflow.common.constant.FlowConstant.FLOWABLE_SKIP_EXPRESSION_ENABLED;
-import static org.dromara.workflow.common.constant.FlowConstant.INITIATOR;
+import static org.dromara.workflow.common.constant.FlowConstant.*;
/**
* 浠诲姟 鏈嶅姟灞傚疄鐜�
@@ -96,7 +97,7 @@
if (CollUtil.isNotEmpty(startProcessBo.getVariables())) {
taskService.setVariables(taskResult.get(0).getId(), startProcessBo.getVariables());
}
- map.put("processInstanceId", taskResult.get(0).getProcessInstanceId());
+ map.put(PROCESS_INSTANCE_ID, taskResult.get(0).getProcessInstanceId());
map.put("taskId", taskResult.get(0).getId());
return map;
}
@@ -129,7 +130,8 @@
runtimeService.updateBusinessStatus(pi.getProcessInstanceId(), BusinessStatusEnum.DRAFT.getStatus());
taskService.setAssignee(taskList.get(0).getId(), LoginHelper.getUserId().toString());
- taskService.setVariable(taskList.get(0).getId(), "processInstanceId", pi.getProcessInstanceId());
+ taskService.setVariable(taskList.get(0).getId(), PROCESS_INSTANCE_ID, pi.getProcessInstanceId());
+ taskService.setVariable(taskList.get(0).getId(), BUSINESS_KEY, pi.getBusinessKey());
map.put("processInstanceId", pi.getProcessInstanceId());
map.put("taskId", taskList.get(0).getId());
return map;
@@ -705,4 +707,24 @@
}
return true;
}
+
+ /**
+ * 鏌ヨ娴佺▼鍙橀噺
+ *
+ * @param taskId 浠诲姟id
+ */
+ @Override
+ public List<VariableVo> getInstanceVariable(String taskId) {
+ List<VariableVo> variableVoList = new ArrayList<>();
+ Map<String, VariableInstance> variableInstances = taskService.getVariableInstances(taskId);
+ if (CollectionUtil.isNotEmpty(variableInstances)) {
+ for (Map.Entry<String, VariableInstance> entry : variableInstances.entrySet()) {
+ VariableVo variableVo = new VariableVo();
+ variableVo.setKey(entry.getKey());
+ variableVo.setValue(entry.getValue().getValue().toString());
+ variableVoList.add(variableVo);
+ }
+ }
+ return variableVoList;
+ }
}
--
Gitblit v1.9.3