dromara/RuoYi-Cloud-Plus
1
0
Fork 0
mirror of https://gitee.com/dromara/RuoYi-Cloud-Plus.git synced 2025-10-14 22:20:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

update 优化 工作流代码

Browse Source
This commit is contained in:
疯狂的狮子Li
2025-03-06 17:36:31 +08:00
parent 2a231ec72c
commit 8879fc6f1b
3 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwCommonService.java
View File

@@ -1,6 +1,7 @@
package org.dromara.workflow.service;
import org.dromara.warm.flow.core.entity.User;
import org.dromara.warm.flow.core.service.UserService;
import java.util.List;
import java.util.Set;
@@ -12,6 +13,11 @@ import java.util.Set;
*/
public interface IFlwCommonService {
/**
* 获取工作流用户service
*/
UserService getFlowUserService();
/**
* 构建工作流用户
*

10
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCommonServiceImpl.java
View File

@@ -64,6 +64,14 @@ public class FlwCommonServiceImpl implements IFlwCommonService {
@DubboReference
private RemoteMailService remoteMailService;
/**
* 获取工作流用户service
*/
@Override
public UserService getFlowUserService() {
return userService;
}
/**
* 构建工作流用户
*
@@ -78,8 +86,8 @@ public class FlwCommonServiceImpl implements IFlwCommonService {
}
Set<User> list = new HashSet<>();
Set<String> processedBySet = new HashSet<>();
for (User user : userList) {
IFlwTaskAssigneeService taskAssigneeService = SpringUtils.getBean(IFlwTaskAssigneeService.class);
for (User user : userList) {
// 根据 processedBy 前缀判断处理人类型，分别获取用户列表
List<RemoteUserVo> users = taskAssigneeService.fetchUsersByStorageId(user.getProcessedBy());
// 转换为 FlowUser 并添加到结果集合

17
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java
View File

@@ -70,7 +70,6 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
private final TaskService taskService;
private final InsService insService;
private final DefService defService;
private final UserService userService;
private final HisTaskService hisTaskService;
private final NodeService nodeService;
private final FlowInstanceMapper flowInstanceMapper;
@@ -200,7 +199,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
}
List<Long> taskIdList = StreamUtils.toList(flowTasks, FlowTask::getId);
// 获取与当前任务关联的用户列表
List<User> associatedUsers = userService.getByAssociateds(taskIdList);
List<User> associatedUsers = flwCommonService.getFlowUserService().getByAssociateds(taskIdList);
if (CollUtil.isEmpty(associatedUsers)) {
return;
}
@@ -213,12 +212,12 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
}
}
// 批量删除现有任务的办理人记录
userService.deleteByTaskIds(taskIdList);
flwCommonService.getFlowUserService().deleteByTaskIds(taskIdList);
// 确保要保存的 userList 不为空
if (CollUtil.isEmpty(userList)) {
return;
}
userService.saveBatch(userList);
flwCommonService.getFlowUserService().saveBatch(userList);
}
/**
@@ -258,7 +257,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
return flowUser;
}).collect(Collectors.toList());
// 批量保存抄送人员
userService.saveBatch(userList);
flwCommonService.getFlowUserService().saveBatch(userList);
}
/**
@@ -633,7 +632,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
List<FlowTask> flowTasks = this.selectByIdList(taskIdList);
// 批量删除现有任务的办理人记录
if (CollUtil.isNotEmpty(flowTasks)) {
userService.deleteByTaskIds(StreamUtils.toList(flowTasks, FlowTask::getId));
flwCommonService.getFlowUserService().deleteByTaskIds(StreamUtils.toList(flowTasks, FlowTask::getId));
List<User> userList = flowTasks.stream()
.map(flowTask -> {
FlowUser flowUser = new FlowUser();
@@ -644,7 +643,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
})
.collect(Collectors.toList());
if (CollUtil.isNotEmpty(userList)) {
userService.saveBatch(userList);
flwCommonService.getFlowUserService().saveBatch(userList);
}
}
} catch (Exception e) {
@@ -663,7 +662,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
public Map<Long, List<RemoteUserVo>> currentTaskAllUser(List<Long> taskIdList) {
Map<Long, List<RemoteUserVo>> map = new HashMap<>();
// 获取与当前任务关联的用户列表
List<User> associatedUsers = userService.getByAssociateds(taskIdList);
List<User> associatedUsers = flwCommonService.getFlowUserService().getByAssociateds(taskIdList);
Map<Long, List<User>> listMap = StreamUtils.groupByKey(associatedUsers, User::getAssociated);
for (Map.Entry<Long, List<User>> entry : listMap.entrySet()) {
List<User> value = entry.getValue();
@@ -683,7 +682,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
@Override
public List<RemoteUserVo> currentTaskAllUser(Long taskId) {
// 获取与当前任务关联的用户列表
List<User> userList = userService.getByAssociateds(Collections.singletonList(taskId));
List<User> userList = flwCommonService.getFlowUserService().getByAssociateds(Collections.singletonList(taskId));
if (CollUtil.isEmpty(userList)) {
return Collections.emptyList();
}