wangli/workflow-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update - 调整一些类的命名,并修复一些简单 bug

Browse Source
This commit is contained in:
wangli 2024-02-18 14:26:10 +08:00
parent 88e9acf0b9
commit 4bfa5f712d
12 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmTransformUtil.java
View File

@ -46,7 +46,7 @@ import static org.flowable.engine.delegate.BaseExecutionListener.EVENTNAME_END;
import static org.flowable.engine.delegate.BaseExecutionListener.EVENTNAME_START;
/**
* 该工具是以前枢智版本使用，候选迭代都通过 BpmnJsonConverterUtil 该工具操作
* 该工具是以前枢智版本使用，后续迭代都通过 BpmnJsonConverterUtil 该工具操作
*/
@Slf4j
@Deprecated

4
workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineExecutionStartListener.java
View File

@ -221,8 +221,8 @@ public class EngineExecutionStartListener implements ExecutionListener {
if (log.isDebugEnabled()) {
log.debug("当前系统 Nacos 配置中开启了 mock: {}, 将使用 mock 方式查找审批人", mock);
}
assigners.addAll(new MockTaskAssigneeSelector(assigneeMap, global, category).select(userTask, execution,
throwException));
assigners.addAll(new MockTaskAssigneeSelector(assigneeMap, global, category)
.select(userTask, execution, throwException));
} else {
selectors.forEach(select -> {
if (select.support(type)) {

3
workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessInstanceServiceImpl.java
View File

@ -578,10 +578,11 @@ public class BpmnProcessInstanceServiceImpl implements BpmnProcessInstanceServic
List<FlowElement> flowElements = forecastService.performProcessForecasting(processInstanceId, instance);
BpmnModel bpmnModel = repositoryService.getBpmnModel(instance.getProcessDefinitionId());
List<ProcessNodeDetailVO> resultList = new ArrayList<>(flowElements.size() + 1);
List<ProcessNodeDetailVO> resultList = new ArrayList<>(flowElements.size());
flowElements.stream().filter(i -> (i instanceof UserTask || i instanceof ReceiveTask || i instanceof ServiceTask))
.forEach(i -> {
ProcessNodeDetailVO node = new ProcessNodeDetailVO();
// 每个节点设置的按钮配置
getButtonConfig(bpmnModel.getMainProcess(), i.getId()).ifPresent(node::setButtonConf);
if (i instanceof UserTask) {
UserTask userTask = (UserTask) i;

7
workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessTaskServiceImpl.java
View File

@ -278,6 +278,7 @@ public class BpmnProcessTaskServiceImpl implements BpmnProcessTaskService {
}
@Override
@Transactional(rollbackFor = Exception.class)
public void approveTask(BpmnTaskAuditDTO dto) {
CommandExecutor commandExecutor = processEngineConfiguration.getCommandExecutor();
commandExecutor.execute(new CustomApproveTaskCmd(dto.getTaskId(), dto.getAdvice(), dto.getAttachmentList(),
@ -285,6 +286,7 @@ public class BpmnProcessTaskServiceImpl implements BpmnProcessTaskService {
}
@Override
@Transactional(rollbackFor = Exception.class)
public void rejectTask(BpmnTaskAuditDTO dto) {
CommandExecutor commandExecutor = processEngineConfiguration.getCommandExecutor();
commandExecutor.execute(new CustomRejectionTaskCmd(dto.getTaskId(), dto.getAdvice(), dto.getAttachmentList(),
@ -453,6 +455,7 @@ public class BpmnProcessTaskServiceImpl implements BpmnProcessTaskService {
@Override
@Transactional(rollbackFor = Exception.class)
public void transferTask(BpmnTaskTransferDTO dto) {
CommandExecutor commandExecutor = processEngineConfiguration.getCommandExecutor();
commandExecutor.execute(new CustomTransferUserTaskCmd(dto.getTaskId(),
@ -461,6 +464,7 @@ public class BpmnProcessTaskServiceImpl implements BpmnProcessTaskService {
@Override
@Transactional(rollbackFor = Exception.class)
public void commentTask(BpmnTaskCommentDTO dto) {
CommandExecutor commandExecutor = processEngineConfiguration.getCommandExecutor();
commandExecutor.execute(new CustomCommentTaskCmd(dto.getProcessInstanceId(),
@ -480,6 +484,7 @@ public class BpmnProcessTaskServiceImpl implements BpmnProcessTaskService {
}
@Override
@Transactional(rollbackFor = Exception.class)
public void countersignTask(BpmnTaskCountersignDTO dto) {
CommandExecutor commandExecutor = processEngineConfiguration.getCommandExecutor();
commandExecutor.execute(new CustomCountersignUserTaskCmd(BpmnCountersignTypeEnum.valueOfType(dto.getCountersignType()), dto.getTaskId(),
@ -527,6 +532,7 @@ public class BpmnProcessTaskServiceImpl implements BpmnProcessTaskService {
}
@Override
@Transactional(rollbackFor = Exception.class)
public String createRobotTask(BpmnRobotTaskCreateDTO dto) {
CommandExecutor commandExecutor = processEngineConfiguration.getCommandExecutor();
return commandExecutor.execute(new CustomCreateDummyTaskCmd(dto.getProcessInstanceId(),
@ -535,6 +541,7 @@ public class BpmnProcessTaskServiceImpl implements BpmnProcessTaskService {
}
@Override
@Transactional(rollbackFor = Exception.class)
public void completeRobotTask(BpmnRobotTaskCompleteDTO dto) {
CommandExecutor commandExecutor = processEngineConfiguration.getCommandExecutor();
commandExecutor.execute(new CustomCompleteDummyTaskCmd(dto.getProcessInstanceId(), dto.getTaskId(),

12
workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/support/FlowNodeForecastService.java
View File

@ -121,17 +121,17 @@ public class FlowNodeForecastService implements InitializingBean {
BpmnModel bpmnModel = repositoryService.getBpmnModel(instance.getProcessDefinitionId());
// 保持推测出来的节点执行顺序的容器
List<FlowElement> orderNodes = new ArrayList<>();
List<FlowElement> orderedNodes = new ArrayList<>();
// 流程定义中所有的FlowElement
Collection<FlowElement> flowElements = bpmnModel.getMainProcess().getFlowElements();
// 开始节点
findStartNode(flowElements).ifPresent(startNode -> {
addOrderFlowNodes(orderNodes, startNode);
addOrderFlowNodes(orderedNodes, startNode);
});
startForecasting(orderNodes, instance);
return orderNodes;
startForecasting(orderedNodes, instance);
return orderedNodes;
}
private void startForecasting(List<FlowElement> orderNodes, ProcessInstance instance) {
@ -156,8 +156,8 @@ public class FlowNodeForecastService implements InitializingBean {
*/
private Optional<StartEvent> findStartNode(Collection<FlowElement> flowElements) {
return Optional.ofNullable(flowElements.stream().filter(StartEvent.class::isInstance).findFirst()
.map(StartEvent.class::cast).orElseThrow(() -> new IllegalArgumentException("非法的参数, 正确的流程定义一定有一个 " +
"StartEvent 节点")));
.map(StartEvent.class::cast)
.orElseThrow(() -> new IllegalArgumentException("非法的参数, 正确的流程定义一定有一个 StartEvent 节点")));
}

2
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/FixedPersonTaskAssigneeSelector.java → workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/BasedFixedPersonTaskAssigneeSelector.java
View File

@ -18,7 +18,7 @@ import java.util.List;
* @since 2023/11/18 22:56
*/
@Component
public class FixedPersonTaskAssigneeSelector extends AbstractBpmnTaskAssigneeSelector {
public class BasedFixedPersonTaskAssigneeSelector extends AbstractBpmnTaskAssigneeSelector {
@Override
public String getType() {
return ApproverSpecifyEnum.fixedPerson.getType();

6
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/IdentityTaskAssigneeSelector.java → workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/BasedIdentityTaskAssigneeSelector.java
View File

@ -26,7 +26,7 @@ import java.util.stream.Collectors;
*/
@Slf4j
@Component
public class IdentityTaskAssigneeSelector extends AbstractBpmnTaskAssigneeSelector {
public class BasedIdentityTaskAssigneeSelector extends AbstractBpmnTaskAssigneeSelector {
@Autowired
private FlowSupportApi flowSupportApi;
@ -61,8 +61,8 @@ public class IdentityTaskAssigneeSelector extends AbstractBpmnTaskAssigneeSelect
.build();
List<FlowTaskAssignerResp> flowTaskAssigners =
parseApiResult(() -> flowSupportApi.listTaskAssignerByIdentity(req), "审批节点: " + userTask.getId() + "," +
" 通过身份查询审批人", req);
parseApiResult(() -> flowSupportApi.listTaskAssignerByIdentity(req),
"审批节点: " + userTask.getId() + ", 通过身份查询审批人", req);
if (CollUtil.isEmpty(flowTaskAssigners)) {
return super.invokeService(userTask, execution, scopeDto);

2
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/InitiatorLeaderRecursionTaskAssigneeSelector.java → workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/BasedInitiatorLeaderRecursionTaskAssigneeSelector.java
View File

@ -20,7 +20,7 @@ import static cn.axzo.workflow.core.common.code.FlowableEngineRespCode.ENGINE_US
* @since 2023/11/16 11:42
*/
@Component
public class InitiatorLeaderRecursionTaskAssigneeSelector extends AbstractBpmnTaskAssigneeSelector {
public class BasedInitiatorLeaderRecursionTaskAssigneeSelector extends AbstractBpmnTaskAssigneeSelector {
@Override
public String getType() {
return ApproverSpecifyEnum.initiatorLeaderRecursion.getType();

2
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/InitiatorLeaderTaskAssigneeSelector.java → workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/BasedInitiatorLeaderTaskAssigneeSelector.java
View File

@ -30,7 +30,7 @@ import static cn.axzo.workflow.common.constant.BpmnConstants.INTERNAL_INITIATOR;
*/
@Slf4j
@Component
public class InitiatorLeaderTaskAssigneeSelector extends AbstractBpmnTaskAssigneeSelector {
public class BasedInitiatorLeaderTaskAssigneeSelector extends AbstractBpmnTaskAssigneeSelector {
@Autowired
private OrganizationalNodeUserApi organizationalNodeUserApi;

2
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/PositionTaskAssigneeSelector.java → workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/BasedPositionTaskAssigneeSelector.java
View File

@ -26,7 +26,7 @@ import java.util.stream.Collectors;
*/
@Slf4j
@Component
public class PositionTaskAssigneeSelector extends AbstractBpmnTaskAssigneeSelector {
public class BasedPositionTaskAssigneeSelector extends AbstractBpmnTaskAssigneeSelector {
@Autowired
private OrganizationalNodeUserApi organizationalNodeUserApi;

2
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/RoleTaskAssigneeSelector.java → workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/BasedRoleTaskAssigneeSelector.java
View File

@ -27,7 +27,7 @@ import java.util.stream.Collectors;
*/
@Slf4j
@Component
public class RoleTaskAssigneeSelector extends AbstractBpmnTaskAssigneeSelector {
public class BasedRoleTaskAssigneeSelector extends AbstractBpmnTaskAssigneeSelector {
@Autowired
private TyrSaasRoleUserApi tyrSaasRoleUserApi;

6
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/AdminTaskAssigneeSelector.java → workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/TransferToAdminTaskAssigneeSelector.java
View File

@ -27,7 +27,7 @@ import java.util.stream.Collectors;
*/
@Slf4j
@Component
public class AdminTaskAssigneeSelector extends AbstractBpmnTaskAssigneeSelector {
public class TransferToAdminTaskAssigneeSelector extends AbstractBpmnTaskAssigneeSelector {
@Autowired
private FlowSupportApi flowSupportApi;
@ -64,8 +64,8 @@ public class AdminTaskAssigneeSelector extends AbstractBpmnTaskAssigneeSelector
}
ListFlowTaskAssignerReq req = builder.build();
List<FlowTaskAssignerResp> flowTaskAssigners =
parseApiResult(() -> flowSupportApi.listTaskAssignerAdmin(req), "审批节点: " + userTask.getId() + ", " +
"通过管理员查询审批人", req);
parseApiResult(() -> flowSupportApi.listTaskAssignerAdmin(req),
"审批节点: " + userTask.getId() + ", 通过管理员查询审批人", req);
if (CollUtil.isEmpty(flowTaskAssigners)) {
return super.invokeService(userTask, execution, scopeDto);