From 11bfde3dc1f8fbb0bfd681e7ba35d491a4f52a06 Mon Sep 17 00:00:00 2001
From: AprilWind <2100166581@qq.com>
Date: 星期六, 25 五月 2024 22:39:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/WorkflowUtils.java | 105 +++++++++++++++++++++++-----------------------------
1 files changed, 46 insertions(+), 59 deletions(-)
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/WorkflowUtils.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/WorkflowUtils.java
index 3d867f0..a620289 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/WorkflowUtils.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/WorkflowUtils.java
@@ -7,26 +7,30 @@
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
+import org.dromara.common.core.domain.dto.RoleDTO;
+import org.dromara.common.core.domain.dto.UserDTO;
+import org.dromara.common.core.service.UserService;
import org.dromara.common.core.utils.SpringUtils;
import org.dromara.common.core.utils.StreamUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.core.utils.reflect.ReflectUtils;
import org.dromara.common.mail.utils.MailUtils;
+import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.common.tenant.helper.TenantHelper;
import org.dromara.common.websocket.dto.WebSocketMessageDto;
import org.dromara.common.websocket.utils.WebSocketUtils;
-import org.dromara.system.domain.SysUserRole;
-import org.dromara.system.domain.vo.SysUserVo;
import org.dromara.workflow.common.constant.FlowConstant;
import org.dromara.workflow.common.enums.BusinessStatusEnum;
import org.dromara.workflow.common.enums.MessageTypeEnum;
import org.dromara.workflow.common.enums.TaskStatusEnum;
import org.dromara.workflow.domain.ActHiProcinst;
import org.dromara.workflow.domain.ActHiTaskinst;
-import org.dromara.workflow.domain.vo.*;
+import org.dromara.workflow.domain.vo.MultiInstanceVo;
+import org.dromara.workflow.domain.vo.ParticipantVo;
+import org.dromara.workflow.domain.vo.ProcessInstanceVo;
import org.dromara.workflow.flowable.cmd.UpdateHiTaskInstCmd;
import org.dromara.workflow.mapper.ActHiTaskinstMapper;
-import org.dromara.workflow.service.*;
+import org.dromara.workflow.service.IActHiProcinstService;
import org.flowable.bpmn.model.BpmnModel;
import org.flowable.bpmn.model.FlowNode;
import org.flowable.common.engine.api.delegate.Expression;
@@ -36,12 +40,13 @@
import org.flowable.engine.impl.bpmn.behavior.SequentialMultiInstanceBehavior;
import org.flowable.identitylink.api.history.HistoricIdentityLink;
import org.flowable.task.api.Task;
+import org.flowable.task.api.TaskQuery;
import org.flowable.task.api.history.HistoricTaskInstance;
import org.flowable.task.service.impl.persistence.entity.TaskEntity;
import java.util.*;
-import static org.dromara.workflow.common.constant.FlowConstant.*;
+import static org.dromara.workflow.common.constant.FlowConstant.PROCESS_INSTANCE_VO;
/**
* 宸ヤ綔娴佸伐鍏�
@@ -52,11 +57,9 @@
public class WorkflowUtils {
private static final ProcessEngine PROCESS_ENGINE = SpringUtils.getBean(ProcessEngine.class);
- private static final IWorkflowUserService WORKFLOW_USER_SERVICE = SpringUtils.getBean(IWorkflowUserService.class);
+ private static final UserService USER_SERVICE = SpringUtils.getBean(UserService.class);
private static final IActHiProcinstService ACT_HI_PROCINST_SERVICE = SpringUtils.getBean(IActHiProcinstService.class);
private static final ActHiTaskinstMapper ACT_HI_TASKINST_MAPPER = SpringUtils.getBean(ActHiTaskinstMapper.class);
- private static final IWfDefinitionConfigService I_WF_DEFINITION_CONFIG_SERVICE = SpringUtils.getBean(IWfDefinitionConfigService.class);
- private static final IWfFormManageService I_WF_FORM_MANAGE_SERVICE = SpringUtils.getBean(IWfFormManageService.class);
/**
* 鍒涘缓涓�涓柊浠诲姟
@@ -140,15 +143,14 @@
List<HistoricIdentityLink> groupList = StreamUtils.filter(linksForTask, e -> StringUtils.isNotBlank(e.getGroupId()));
if (CollUtil.isNotEmpty(groupList)) {
List<Long> groupIds = StreamUtils.toList(groupList, e -> Long.valueOf(e.getGroupId()));
- List<SysUserRole> sysUserRoles = WORKFLOW_USER_SERVICE.getUserRoleListByRoleIds(groupIds);
- if (CollUtil.isNotEmpty(sysUserRoles)) {
+ List<Long> userIds = USER_SERVICE.selectUserIdsByRoleIds(groupIds);
+ if (CollUtil.isNotEmpty(userIds)) {
participantVo.setGroupIds(groupIds);
- List<Long> userIdList = StreamUtils.toList(sysUserRoles, SysUserRole::getUserId);
- List<SysUserVo> sysUsers = WORKFLOW_USER_SERVICE.getUserListByIds(userIdList);
- if (CollUtil.isNotEmpty(sysUsers)) {
- List<Long> userIds = StreamUtils.toList(sysUsers, SysUserVo::getUserId);
- List<String> nickNames = StreamUtils.toList(sysUsers, SysUserVo::getNickName);
- participantVo.setCandidate(userIds);
+ List<UserDTO> userList = USER_SERVICE.selectListByIds(userIds);
+ if (CollUtil.isNotEmpty(userList)) {
+ List<Long> userIdList = StreamUtils.toList(userList, UserDTO::getUserId);
+ List<String> nickNames = StreamUtils.toList(userList, UserDTO::getNickName);
+ participantVo.setCandidate(userIdList);
participantVo.setCandidateName(nickNames);
participantVo.setClaim(!StringUtils.isBlank(task.getAssignee()));
}
@@ -163,10 +165,10 @@
}
}
- List<SysUserVo> sysUsers = WORKFLOW_USER_SERVICE.getUserListByIds(userIdList);
- if (CollUtil.isNotEmpty(sysUsers)) {
- List<Long> userIds = StreamUtils.toList(sysUsers, SysUserVo::getUserId);
- List<String> nickNames = StreamUtils.toList(sysUsers, SysUserVo::getNickName);
+ List<UserDTO> userList = USER_SERVICE.selectListByIds(userIdList);
+ if (CollUtil.isNotEmpty(userList)) {
+ List<Long> userIds = StreamUtils.toList(userList, UserDTO::getUserId);
+ List<String> nickNames = StreamUtils.toList(userList, UserDTO::getNickName);
participantVo.setCandidate(userIds);
participantVo.setCandidateName(nickNames);
// 鍒ゆ柇褰撳墠浠诲姟鏄惁鍏锋湁澶氫釜鍔炵悊浜�
@@ -293,40 +295,6 @@
}
/**
- * 璁剧疆娴佺▼娴佺▼瀹氫箟閰嶇疆
- *
- * @param obj 涓氬姟瀵硅薄
- * @param idList 娴佺▼瀹氫箟id
- * @param fieldName 娴佺▼瀹氫箟ID灞炴�у悕绉�
- */
- public static void setWfDefinitionConfigVo(Object obj, List<String> idList, String fieldName) {
- if (CollUtil.isEmpty(idList) || obj == null) {
- return;
- }
- List<WfDefinitionConfigVo> wfDefinitionConfigVoList = I_WF_DEFINITION_CONFIG_SERVICE.queryList(idList);
- if (CollUtil.isNotEmpty(wfDefinitionConfigVoList)) {
- List<Long> formIds = StreamUtils.toList(wfDefinitionConfigVoList, WfDefinitionConfigVo::getFormId);
- List<WfFormManageVo> wfFormManageVos = I_WF_FORM_MANAGE_SERVICE.queryByIds(formIds);
- if (CollUtil.isNotEmpty(wfFormManageVos)) {
- for (WfDefinitionConfigVo wfDefinitionConfigVo : wfDefinitionConfigVoList) {
- wfFormManageVos.stream().filter(e -> ObjectUtil.equals(wfDefinitionConfigVo.getFormId(), e.getId())).findFirst().ifPresent(wfDefinitionConfigVo::setWfFormManageVo);
- }
- }
- }
- if (obj instanceof Collection<?> collection) {
- for (Object o : collection) {
- String fieldValue = ReflectUtils.invokeGetter(o, fieldName).toString();
- if (!CollUtil.isEmpty(wfDefinitionConfigVoList)) {
- wfDefinitionConfigVoList.stream().filter(e -> e.getDefinitionId().equals(fieldValue)).findFirst().ifPresent(e -> {
- ReflectUtils.invokeSetter(o, WF_DEFINITION_CONFIG_VO, BeanUtil.toBean(e, WfDefinitionConfigVo.class));
- });
- }
- }
- }
- }
-
-
- /**
* 鍙戦�佹秷鎭�
*
* @param list 浠诲姟
@@ -342,9 +310,9 @@
for (Task t : list) {
ParticipantVo taskParticipant = WorkflowUtils.getCurrentTaskParticipant(t.getId());
if (CollUtil.isNotEmpty(taskParticipant.getGroupIds())) {
- List<SysUserRole> sysUserRoles = WORKFLOW_USER_SERVICE.getUserRoleListByRoleIds(taskParticipant.getGroupIds());
- if (CollUtil.isNotEmpty(sysUserRoles)) {
- userIds.addAll(StreamUtils.toList(sysUserRoles, SysUserRole::getUserId));
+ List<Long> userIdList = USER_SERVICE.selectUserIdsByRoleIds(taskParticipant.getGroupIds());
+ if (CollUtil.isNotEmpty(userIdList)) {
+ userIds.addAll(userIdList);
}
}
List<Long> candidate = taskParticipant.getCandidate();
@@ -353,7 +321,7 @@
}
}
if (CollUtil.isNotEmpty(userIds)) {
- List<SysUserVo> sysUserVoList = WORKFLOW_USER_SERVICE.getUserListByIds(new ArrayList<>(userIds));
+ List<UserDTO> userList = USER_SERVICE.selectListByIds(new ArrayList<>(userIds));
for (String code : messageType) {
MessageTypeEnum messageTypeEnum = MessageTypeEnum.getByCode(code);
if (ObjectUtil.isNotEmpty(messageTypeEnum)) {
@@ -365,7 +333,7 @@
WebSocketUtils.publishMessage(dto);
break;
case EMAIL_MESSAGE:
- MailUtils.sendText(StreamUtils.join(sysUserVoList, SysUserVo::getEmail), "鍗曟嵁瀹℃壒鎻愰啋", message);
+ MailUtils.sendText(StreamUtils.join(userList, UserDTO::getEmail), "鍗曟嵁瀹℃壒鎻愰啋", message);
break;
case SMS_MESSAGE:
//todo 鐭俊鍙戦��
@@ -375,4 +343,23 @@
}
}
}
+
+ /**
+ * 鏍规嵁浠诲姟id鏌ヨ 褰撳墠鐢ㄦ埛鐨勪换鍔★紝妫�鏌� 褰撳墠浜哄憳 鏄惁鏄 taskId 鐨勫姙鐞嗕汉
+ * @param taskId 浠诲姟id
+ * @return
+ */
+ public static Task getTaskByCurrUser(String taskId){
+ TaskQuery taskQuery = QueryUtils.taskQuery();
+ taskQuery.taskId(taskId).taskCandidateOrAssigned(String.valueOf(LoginHelper.getUserId()));
+
+ List<RoleDTO> roles = LoginHelper.getLoginUser().getRoles();
+ if (CollUtil.isNotEmpty(roles)) {
+ List<String> groupIds = StreamUtils.toList(roles, e -> String.valueOf(e.getRoleId()));
+ taskQuery.taskCandidateGroupIn(groupIds);
+ }
+ Task task = taskQuery.singleResult();
+
+ return task;
+ }
}
--
Gitblit v1.9.3