Skip to content

Commit b8d26f8

Browse files
YunaiVYunaiV
committedNov 23, 2024·
README：增加工作流的演示图片
·
v2.4.0(jdk8/11)
1 parent 9da052a commit b8d26f8

24 files changed

+34
-30
lines changed
 

‎yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmModelController.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717
import io.swagger.v3.oas.annotations.Operation;
1818
import io.swagger.v3.oas.annotations.Parameter;
1919
import io.swagger.v3.oas.annotations.tags.Tag;
20-
import jakarta.annotation.Resource;
21-
import jakarta.validation.Valid;
2220
import org.flowable.engine.repository.Deployment;
2321
import org.flowable.engine.repository.Model;
2422
import org.flowable.engine.repository.ProcessDefinition;
2523
import org.springframework.security.access.prepost.PreAuthorize;
2624
import org.springframework.validation.annotation.Validated;
2725
import org.springframework.web.bind.annotation.*;
2826

27+
import javax.annotation.Resource;
28+
import javax.validation.Valid;
2929
import java.util.Collections;
3030
import java.util.List;
3131
import java.util.Map;

‎yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmTaskController.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
import io.swagger.v3.oas.annotations.Operation;
1818
import io.swagger.v3.oas.annotations.Parameter;
1919
import io.swagger.v3.oas.annotations.tags.Tag;
20-
import jakarta.annotation.Resource;
21-
import jakarta.validation.Valid;
2220
import org.flowable.bpmn.model.UserTask;
2321
import org.flowable.engine.history.HistoricProcessInstance;
2422
import org.flowable.engine.runtime.ProcessInstance;
@@ -28,6 +26,8 @@
2826
import org.springframework.validation.annotation.Validated;
2927
import org.springframework.web.bind.annotation.*;
3028

29+
import javax.annotation.Resource;
30+
import javax.validation.Valid;
3131
import java.util.Collections;
3232
import java.util.List;
3333
import java.util.Map;

‎yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmApprovalDetailReqVO.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import cn.hutool.core.util.StrUtil;
44
import com.fasterxml.jackson.annotation.JsonIgnore;
55
import io.swagger.v3.oas.annotations.media.Schema;
6-
import jakarta.validation.constraints.AssertTrue;
76
import lombok.Data;
87

8+
import javax.validation.constraints.AssertTrue;
99
import java.util.Map;
1010

1111
@Schema(description = "管理后台 - 审批详情 Request VO")

‎yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskApproveReqVO.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task;
22

33
import io.swagger.v3.oas.annotations.media.Schema;
4-
import jakarta.validation.constraints.NotEmpty;
54
import lombok.Data;
65

6+
import javax.validation.constraints.NotEmpty;
77
import java.util.Map;
88

99
@Schema(description = "管理后台 - 通过流程任务的 Request VO")

‎yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskCopyReqVO.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task;
22

33
import io.swagger.v3.oas.annotations.media.Schema;
4-
import jakarta.validation.constraints.NotEmpty;
54
import lombok.Data;
65

6+
import javax.validation.constraints.NotEmpty;
77
import java.util.Collection;
88

99
@Schema(description = "管理后台 - 抄送流程任务的 Request VO")

‎yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/dept/AbstractBpmTaskCandidateDeptLeaderStrategy.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,12 @@
77
import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
88
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
99
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
10-
import jakarta.annotation.Resource;
1110

12-
import java.util.*;
11+
import javax.annotation.Resource;
12+
import java.util.HashSet;
13+
import java.util.LinkedHashSet;
14+
import java.util.List;
15+
import java.util.Set;
1316

1417
/**
1518
* 部门的负责人 {@link BpmTaskCandidateStrategy} 抽象类

‎yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateDeptLeaderStrategy.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
import cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmTaskCandidateStrategyEnum;
66
import cn.iocoder.yudao.module.system.api.dept.DeptApi;
77
import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
8-
import jakarta.annotation.Resource;
98
import org.springframework.stereotype.Component;
109

10+
import javax.annotation.Resource;
1111
import java.util.List;
1212
import java.util.Set;
1313

‎yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateDeptMemberStrategy.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
import cn.iocoder.yudao.module.system.api.dept.DeptApi;
77
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
88
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
9-
import jakarta.annotation.Resource;
109
import org.springframework.stereotype.Component;
1110

11+
import javax.annotation.Resource;
1212
import java.util.List;
1313
import java.util.Set;
1414

‎yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateStartUserDeptLeaderMultiStrategy.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
import cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmTaskCandidateStrategyEnum;
77
import cn.iocoder.yudao.module.bpm.service.task.BpmProcessInstanceService;
88
import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
9-
import jakarta.annotation.Resource;
109
import org.flowable.bpmn.model.BpmnModel;
1110
import org.flowable.engine.delegate.DelegateExecution;
1211
import org.flowable.engine.runtime.ProcessInstance;
1312
import org.springframework.context.annotation.Lazy;
1413
import org.springframework.stereotype.Component;
1514

15+
import javax.annotation.Resource;
1616
import java.util.HashSet;
1717
import java.util.Map;
1818
import java.util.Set;

‎yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateStartUserDeptLeaderStrategy.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
import cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmTaskCandidateStrategyEnum;
77
import cn.iocoder.yudao.module.bpm.service.task.BpmProcessInstanceService;
88
import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
9-
import jakarta.annotation.Resource;
109
import org.flowable.bpmn.model.BpmnModel;
1110
import org.flowable.engine.delegate.DelegateExecution;
1211
import org.flowable.engine.runtime.ProcessInstance;
1312
import org.springframework.context.annotation.Lazy;
1413
import org.springframework.stereotype.Component;
1514

15+
import javax.annotation.Resource;
1616
import java.util.HashSet;
1717
import java.util.Map;
1818
import java.util.Set;

‎yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateStartUserSelectStrategy.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.FlowableUtils;
1010
import cn.iocoder.yudao.module.bpm.service.task.BpmProcessInstanceService;
1111
import com.google.common.collect.Sets;
12-
import jakarta.annotation.Resource;
1312
import org.flowable.bpmn.model.BpmnModel;
1413
import org.flowable.bpmn.model.ServiceTask;
1514
import org.flowable.bpmn.model.Task;
@@ -19,6 +18,7 @@
1918
import org.springframework.context.annotation.Lazy;
2019
import org.springframework.stereotype.Component;
2120

21+
import javax.annotation.Resource;
2222
import java.util.*;
2323

2424
/**

‎yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/other/BpmTaskCandidateAssignEmptyStrategy.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
import cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmTaskCandidateStrategyEnum;
88
import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.BpmnModelUtils;
99
import cn.iocoder.yudao.module.bpm.service.definition.BpmProcessDefinitionService;
10-
import jakarta.annotation.Resource;
1110
import org.flowable.bpmn.model.BpmnModel;
1211
import org.flowable.bpmn.model.FlowElement;
1312
import org.flowable.engine.delegate.DelegateExecution;
1413
import org.springframework.context.annotation.Lazy;
1514
import org.springframework.stereotype.Component;
1615

16+
import javax.annotation.Resource;
1717
import java.util.HashSet;
1818
import java.util.Map;
1919
import java.util.Objects;

‎yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/user/BpmTaskCandidateGroupStrategy.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
import cn.iocoder.yudao.module.bpm.framework.flowable.core.candidate.BpmTaskCandidateStrategy;
66
import cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmTaskCandidateStrategyEnum;
77
import cn.iocoder.yudao.module.bpm.service.definition.BpmUserGroupService;
8-
import jakarta.annotation.Resource;
98
import org.springframework.stereotype.Component;
109

10+
import javax.annotation.Resource;
1111
import java.util.Collection;
1212
import java.util.List;
1313
import java.util.Set;

‎yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/user/BpmTaskCandidatePostStrategy.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
import cn.iocoder.yudao.module.system.api.dept.PostApi;
77
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
88
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
9-
import jakarta.annotation.Resource;
109
import org.springframework.stereotype.Component;
1110

11+
import javax.annotation.Resource;
1212
import java.util.List;
1313
import java.util.Set;
1414

‎yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/user/BpmTaskCandidateRoleStrategy.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
import cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmTaskCandidateStrategyEnum;
66
import cn.iocoder.yudao.module.system.api.permission.PermissionApi;
77
import cn.iocoder.yudao.module.system.api.permission.RoleApi;
8-
import jakarta.annotation.Resource;
98
import org.springframework.stereotype.Component;
109

10+
import javax.annotation.Resource;
1111
import java.util.Set;
1212

1313
/**

‎yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/user/BpmTaskCandidateStartUserStrategy.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
import cn.iocoder.yudao.module.bpm.framework.flowable.core.candidate.BpmTaskCandidateStrategy;
55
import cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmTaskCandidateStrategyEnum;
66
import cn.iocoder.yudao.module.bpm.service.task.BpmProcessInstanceService;
7-
import jakarta.annotation.Resource;
87
import org.flowable.bpmn.model.BpmnModel;
98
import org.flowable.engine.delegate.DelegateExecution;
109
import org.flowable.engine.runtime.ProcessInstance;
1110
import org.springframework.context.annotation.Lazy;
1211
import org.springframework.stereotype.Component;
1312

13+
import javax.annotation.Resource;
1414
import java.util.Map;
1515
import java.util.Set;
1616

‎yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/user/BpmTaskCandidateUserStrategy.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
import cn.iocoder.yudao.module.bpm.framework.flowable.core.candidate.BpmTaskCandidateStrategy;
66
import cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmTaskCandidateStrategyEnum;
77
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
8-
import jakarta.annotation.Resource;
98
import org.springframework.stereotype.Component;
109

10+
import javax.annotation.Resource;
1111
import java.util.LinkedHashSet;
1212

1313
/**

‎yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmCategoryServiceImpl.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.category.BpmCategorySaveReqVO;
99
import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmCategoryDO;
1010
import cn.iocoder.yudao.module.bpm.dal.mysql.category.BpmCategoryMapper;
11-
import jakarta.annotation.Resource;
1211
import org.springframework.stereotype.Service;
1312
import org.springframework.transaction.annotation.Transactional;
1413
import org.springframework.validation.annotation.Validated;
1514

15+
import javax.annotation.Resource;
1616
import java.util.Collection;
1717
import java.util.Collections;
1818
import java.util.List;
@@ -115,7 +115,7 @@ public List<BpmCategoryDO> getCategoryListByStatus(Integer status) {
115115
@Transactional(rollbackFor = Exception.class)
116116
public void updateCategorySortBatch(List<Long> ids) {
117117
// 校验分类都存在
118-
List<BpmCategoryDO> categories = bpmCategoryMapper.selectByIds(ids);
118+
List<BpmCategoryDO> categories = bpmCategoryMapper.selectBatchIds(ids);
119119
if (categories.size() != ids.size()) {
120120
throw exception(CATEGORY_NOT_EXISTS);
121121
}

‎yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelService.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.BpmModelSaveReqVO;
44
import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.simple.BpmSimpleModelNodeVO;
55
import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.simple.BpmSimpleModelUpdateReqVO;
6-
import jakarta.validation.Valid;
76
import org.flowable.bpmn.model.BpmnModel;
87
import org.flowable.engine.repository.Model;
98

9+
import javax.validation.Valid;
1010
import java.util.List;
1111

1212
/**

‎yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmProcessDefinitionServiceImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import cn.iocoder.yudao.module.bpm.dal.mysql.definition.BpmProcessDefinitionInfoMapper;
1313
import cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmnModelConstants;
1414
import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.FlowableUtils;
15-
import jakarta.annotation.Resource;
1615
import lombok.extern.slf4j.Slf4j;
1716
import org.flowable.bpmn.model.BpmnModel;
1817
import org.flowable.common.engine.impl.db.SuspensionState;
@@ -24,6 +23,7 @@
2423
import org.springframework.stereotype.Service;
2524
import org.springframework.validation.annotation.Validated;
2625

26+
import javax.annotation.Resource;
2727
import java.util.*;
2828

2929
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;

‎yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceCopyService.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import cn.iocoder.yudao.framework.common.pojo.PageResult;
44
import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceCopyPageReqVO;
55
import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmProcessInstanceCopyDO;
6-
import jakarta.validation.constraints.NotEmpty;
76
import org.flowable.bpmn.model.FlowNode;
87

8+
import javax.validation.constraints.NotEmpty;
99
import java.util.Collection;
1010

1111
/**

‎yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java

+1-1
Large diffs are not rendered by default.

‎yudao-module-bpm/yudao-module-bpm-biz/src/test/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/BpmTaskCandidateInvokerTest.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package cn.iocoder.yudao.module.bpm.framework.flowable.core.candidate;
22

3+
import cn.hutool.core.collection.ListUtil;
34
import cn.hutool.core.map.MapUtil;
45
import cn.hutool.extra.spring.SpringUtil;
56
import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
@@ -64,7 +65,7 @@ public class BpmTaskCandidateInvokerTest extends BaseMockitoUnitTest {
6465
public void setUp() {
6566
userStrategy = new BpmTaskCandidateUserStrategy(); // 创建 strategy 实例
6667
when(emptyStrategy.getStrategy()).thenReturn(BpmTaskCandidateStrategyEnum.ASSIGN_EMPTY);
67-
strategyList = List.of(userStrategy, emptyStrategy); // 创建 strategyList
68+
strategyList = ListUtil.of(userStrategy, emptyStrategy); // 创建 strategyList
6869
taskCandidateInvoker = new BpmTaskCandidateInvoker(strategyList, adminUserApi);
6970
}
7071

‎yudao-module-bpm/yudao-module-bpm-biz/src/test/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateStartUserSelectStrategyTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package cn.iocoder.yudao.module.bpm.framework.flowable.core.candidate.strategy.dept;
22

3+
import cn.hutool.core.collection.ListUtil;
34
import cn.hutool.core.map.MapUtil;
45
import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;
56
import cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmnVariableConstants;
@@ -12,7 +13,6 @@
1213
import org.mockito.Mock;
1314

1415
import java.util.HashMap;
15-
import java.util.List;
1616
import java.util.Map;
1717
import java.util.Set;
1818

@@ -41,7 +41,7 @@ public void testCalculateUsersByTask() {
4141
// mock 方法（FlowableUtils）
4242
Map<String, Object> processVariables = new HashMap<>();
4343
processVariables.put(BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_START_USER_SELECT_ASSIGNEES,
44-
MapUtil.of("activity_001", List.of(1L, 2L)));
44+
MapUtil.of("activity_001", ListUtil.of(1L, 2L)));
4545
when(processInstance.getProcessVariables()).thenReturn(processVariables);
4646

4747
// 调用
@@ -56,7 +56,7 @@ public void testCalculateUsersByActivity() {
5656
String activityId = "activity_001";
5757
Map<String, Object> processVariables = new HashMap<>();
5858
processVariables.put(BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_START_USER_SELECT_ASSIGNEES,
59-
MapUtil.of("activity_001", List.of(1L, 2L)));
59+
MapUtil.of("activity_001", ListUtil.of(1L, 2L)));
6060

6161
// 调用
6262
Set<Long> userIds = strategy.calculateUsersByActivity(null, activityId, null,

0 commit comments

Comments
 (0)
Please sign in to comment.