From cb296ef2cd5f00b5593e3691ff7681a1dcfbd9d4 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 09 五月 2024 15:09:54 +0800
Subject: [PATCH] update 重构 workflow 模块与 system 模块解耦
---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java | 105 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 98 insertions(+), 7 deletions(-)
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 e4bac73..64cd9ae 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
@@ -2,14 +2,15 @@
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.dto.RoleDTO;
+import org.dromara.common.core.domain.dto.UserDTO;
import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.service.UserService;
import org.dromara.common.core.utils.StreamUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.PageQuery;
@@ -30,6 +31,7 @@
import org.dromara.workflow.mapper.ActHiTaskinstMapper;
import org.dromara.workflow.mapper.ActTaskMapper;
import org.dromara.workflow.service.IActTaskService;
+import org.dromara.workflow.service.IWfDefinitionConfigService;
import org.dromara.workflow.service.IWfNodeConfigService;
import org.dromara.workflow.service.IWfTaskBackNodeService;
import org.dromara.workflow.utils.ModelUtils;
@@ -78,6 +80,8 @@
private final IWfTaskBackNodeService iWfTaskBackNodeService;
private final ActHiTaskinstMapper actHiTaskinstMapper;
private final IWfNodeConfigService iWfNodeConfigService;
+ private final IWfDefinitionConfigService iWfDefinitionConfigService;
+ private final UserService userService;
/**
* 鍚姩浠诲姟
@@ -106,6 +110,10 @@
map.put("taskId", taskResult.get(0).getId());
return map;
}
+ WfDefinitionConfigVo wfDefinitionConfigVo = iWfDefinitionConfigService.getByTableNameLastVersion(startProcessBo.getTableName());
+ if (wfDefinitionConfigVo == null) {
+ throw new ServiceException("璇峰埌娴佺▼瀹氫箟缁戝畾涓氬姟琛ㄥ悕涓庢祦绋婯EY锛�");
+ }
// 璁剧疆鍚姩浜�
identityService.setAuthenticatedUserId(String.valueOf(LoginHelper.getUserId()));
Authentication.setAuthenticatedUserId(String.valueOf(LoginHelper.getUserId()));
@@ -118,12 +126,12 @@
ProcessInstance pi;
try {
if (TenantHelper.isEnable()) {
- pi = runtimeService.startProcessInstanceByKeyAndTenantId(startProcessBo.getProcessKey(), startProcessBo.getBusinessKey(), variables, TenantHelper.getTenantId());
+ pi = runtimeService.startProcessInstanceByKeyAndTenantId(wfDefinitionConfigVo.getProcessKey(), startProcessBo.getBusinessKey(), variables, TenantHelper.getTenantId());
} else {
- pi = runtimeService.startProcessInstanceByKey(startProcessBo.getProcessKey(), startProcessBo.getBusinessKey(), variables);
+ pi = runtimeService.startProcessInstanceByKey(wfDefinitionConfigVo.getProcessKey(), startProcessBo.getBusinessKey(), variables);
}
} catch (FlowableObjectNotFoundException e) {
- throw new ServiceException("鎵句笉鍒板綋鍓嶃��" + startProcessBo.getProcessKey() + "銆戞祦绋嬪畾涔夛紒");
+ throw new ServiceException("鎵句笉鍒板綋鍓嶃��" + wfDefinitionConfigVo.getProcessKey() + "銆戞祦绋嬪畾涔夛紒");
}
// 灏嗘祦绋嬪畾涔夊悕绉� 浣滀负 娴佺▼瀹炰緥鍚嶇О
runtimeService.setProcessInstanceName(pi.getProcessInstanceId(), pi.getProcessDefinitionName());
@@ -511,9 +519,9 @@
}
taskService.addComment(task.getId(), task.getProcessInstanceId(), TaskStatusEnum.TERMINATION.getStatus(), terminationBo.getComment());
List<Task> list = QueryUtils.taskQuery(task.getProcessInstanceId()).list();
- if (CollectionUtil.isNotEmpty(list)) {
+ if (CollUtil.isNotEmpty(list)) {
List<Task> subTasks = StreamUtils.filter(list, e -> StringUtils.isNotBlank(e.getParentTaskId()));
- if (CollectionUtil.isNotEmpty(subTasks)) {
+ if (CollUtil.isNotEmpty(subTasks)) {
subTasks.forEach(e -> taskService.deleteTask(e.getId()));
}
runtimeService.updateBusinessStatus(task.getProcessInstanceId(), BusinessStatusEnum.TERMINATION.getStatus());
@@ -762,7 +770,7 @@
public List<VariableVo> getInstanceVariable(String taskId) {
List<VariableVo> variableVoList = new ArrayList<>();
Map<String, VariableInstance> variableInstances = taskService.getVariableInstances(taskId);
- if (CollectionUtil.isNotEmpty(variableInstances)) {
+ if (CollUtil.isNotEmpty(variableInstances)) {
for (Map.Entry<String, VariableInstance> entry : variableInstances.entrySet()) {
VariableVo variableVo = new VariableVo();
variableVo.setKey(entry.getKey());
@@ -772,4 +780,87 @@
}
return variableVoList;
}
+
+ @Override
+ @SuppressWarnings("unchecked")
+ public String getTaskUserIdsByAddMultiInstance(String taskId) {
+ Task task = QueryUtils.taskQuery().taskId(taskId).singleResult();
+ if (task == null) {
+ throw new ServiceException("浠诲姟涓嶅瓨鍦�");
+ }
+ MultiInstanceVo multiInstance = WorkflowUtils.isMultiInstance(task.getProcessDefinitionId(), task.getTaskDefinitionKey());
+ if (multiInstance == null) {
+ return "";
+ }
+ List<Long> userIds;
+ if (multiInstance.getType() instanceof SequentialMultiInstanceBehavior) {
+ userIds = (List<Long>) runtimeService.getVariable(task.getExecutionId(), multiInstance.getAssigneeList());
+ } else {
+ List<Task> list = QueryUtils.taskQuery(task.getProcessInstanceId()).list();
+ userIds = StreamUtils.toList(list, e -> Long.valueOf(e.getAssignee()));
+ }
+ return StringUtils.join(userIds, StringUtils.SEPARATOR);
+ }
+
+ /**
+ * 鏌ヨ宸ヤ綔娴侀�夋嫨鍑忕浜哄憳
+ *
+ * @param taskId 浠诲姟id 浠诲姟id
+ */
+ @Override
+ @SuppressWarnings("unchecked")
+ public List<TaskVo> getListByDeleteMultiInstance(String taskId) {
+ Task task = QueryUtils.taskQuery().taskId(taskId).singleResult();
+ List<Task> taskList = QueryUtils.taskQuery(task.getProcessInstanceId()).list();
+ MultiInstanceVo multiInstance = WorkflowUtils.isMultiInstance(task.getProcessDefinitionId(), task.getTaskDefinitionKey());
+ List<TaskVo> taskListVo = new ArrayList<>();
+ if (multiInstance == null) {
+ return List.of();
+ }
+ List<Long> assigneeList = new ArrayList<>();
+ if (multiInstance.getType() instanceof SequentialMultiInstanceBehavior) {
+ List<Object> variable = (List<Object>) runtimeService.getVariable(task.getExecutionId(), multiInstance.getAssigneeList());
+ for (Object o : variable) {
+ assigneeList.add(Long.valueOf(o.toString()));
+ }
+ }
+
+ if (multiInstance.getType() instanceof SequentialMultiInstanceBehavior) {
+ List<Long> userIds = StreamUtils.filter(assigneeList, e -> !String.valueOf(e).equals(task.getAssignee()));
+ List<UserDTO> userList = userService.selectListByIds(userIds);
+ for (Long userId : userIds) {
+ TaskVo taskVo = new TaskVo();
+ taskVo.setId("涓茶浼氱");
+ taskVo.setExecutionId("涓茶浼氱");
+ taskVo.setProcessInstanceId(task.getProcessInstanceId());
+ taskVo.setName(task.getName());
+ taskVo.setAssignee(userId);
+ if (CollUtil.isNotEmpty(userList)) {
+ userList.stream().filter(u -> u.getUserId().toString().equals(userId.toString())).findFirst().ifPresent(u -> taskVo.setAssigneeName(u.getNickName()));
+ }
+ taskListVo.add(taskVo);
+ }
+ return taskListVo;
+ } else if (multiInstance.getType() instanceof ParallelMultiInstanceBehavior) {
+ List<Task> tasks = StreamUtils.filter(taskList, e -> StringUtils.isBlank(e.getParentTaskId()) && !e.getExecutionId().equals(task.getExecutionId()) && e.getTaskDefinitionKey().equals(task.getTaskDefinitionKey()));
+ if (CollUtil.isNotEmpty(tasks)) {
+ List<Long> userIds = StreamUtils.toList(tasks, e -> Long.valueOf(e.getAssignee()));
+ List<UserDTO> userList = userService.selectListByIds(userIds);
+ for (Task t : tasks) {
+ TaskVo taskVo = new TaskVo();
+ taskVo.setId(t.getId());
+ taskVo.setExecutionId(t.getExecutionId());
+ taskVo.setProcessInstanceId(t.getProcessInstanceId());
+ taskVo.setName(t.getName());
+ taskVo.setAssignee(Long.valueOf(t.getAssignee()));
+ if (CollUtil.isNotEmpty(userList)) {
+ userList.stream().filter(u -> u.getUserId().toString().equals(t.getAssignee())).findFirst().ifPresent(e -> taskVo.setAssigneeName(e.getNickName()));
+ }
+ taskListVo.add(taskVo);
+ }
+ return taskListVo;
+ }
+ }
+ return List.of();
+ }
}
--
Gitblit v1.9.3