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

update - 优化代码, 移除无用的逻辑

Browse Source
This commit is contained in:
wangli 2024-03-28 15:38:18 +08:00
parent f9db16daa3
commit 2aafb1500b
4 changed files with 12 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,6 +64,7 @@ import static cn.axzo.workflow.core.engine.cmd.helper.CustomTaskHelper.removeDup
@RefreshScope
@Slf4j
public class EngineExecutionStartListener implements ExecutionListener {
private static final long serialVersionUID = 1L;
@Resource
private ObjectProvider<BpmnTaskDelegate> bpmTaskDelegate;
@Resource
@ -90,11 +91,6 @@ public class EngineExecutionStartListener implements ExecutionListener {
Process mainProcess = ProcessDefinitionUtil.getBpmnModel(execution.getProcessDefinitionId()).getMainProcess();
UserTask userTask = (UserTask) mainProcess.getFlowElement(currentActivityId);
Optional<BpmnFlowNodeType> nodeType = getNodeType(userTask);
if (nodeType.isPresent() && Objects.equals(nodeType.get(), NODE_STARTER)) {
}
// 从 version=1.2.1-SNAPSHOT 开始，才给 process 节点增加了 serverVersion 属性
Optional<String> processServerVersion = getProcessServerVersion(mainProcess);
if (processServerVersion.isPresent()) {

14
workflow-engine-core/src/main/java/cn/axzo/workflow/core/listener/impl/InternalExtAxTaskInstEvent_min_Listener.java
View File

@ -42,21 +42,8 @@ public class InternalExtAxTaskInstEvent_min_Listener implements BpmnTaskEventLis
return Integer.MIN_VALUE;
}
@Override
public void onAssigned(DelegateTask delegateTask) {
}
@Override
public void onCreated(DelegateTask delegateTask) {
// ProcessEngineConfigurationImpl processEngineConfiguration =
// CommandContextUtil.getProcessEngineConfiguration();
// FlowableEventDispatcher eventDispatcher = processEngineConfiguration.getEventDispatcher();
// eventDispatcher.dispatchEvent(new ExtTaskInstUpdateEvent(delegateTask.getProcessInstanceId(),
// delegateTask.getTaskDefinitionKey(), delegateTask.getId(), PROCESSING),
// processEngineConfiguration.getEngineCfgKey());
String assignee;
// 记录发起人
if (Objects.equals(delegateTask.getTaskDefinitionKey(), NODE_STARTER.getType())) {
@ -73,7 +60,6 @@ public class InternalExtAxTaskInstEvent_min_Listener implements BpmnTaskEventLis
assignee = delegateTask.getAssignee();
}
ProcessEngineConfigurationImpl processEngineConfiguration =
CommandContextUtil.getProcessEngineConfiguration();
FlowableEventDispatcher eventDispatcher = processEngineConfiguration.getEventDispatcher();

9
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/AutoOperatorEvent_103_Listener.java
View File

@ -72,15 +72,6 @@ public class AutoOperatorEvent_103_Listener implements BpmnTaskEventListener, Or
private final HistoryService historyService;
private final ExtAxHiTaskInstService extAxHiTaskInstService;
@Override
public void onAssigned(DelegateTask delegateTask) {
// Process mainProcess = repositoryService.getBpmnModel(delegateTask.getProcessDefinitionId())
// .getMainProcess();
// UserTask userTask = (UserTask) mainProcess.getFlowElement(delegateTask.getTaskDefinitionKey());
}
@Override
public void onCreated(DelegateTask delegateTask) {
if (log.isDebugEnabled()) {

20
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/SnapshotBpmnTaskTaskEvent_100_Listener.java
View File

@ -47,15 +47,17 @@ public class SnapshotBpmnTaskTaskEvent_100_Listener implements BpmnTaskEventList
INTERNAL_ACTIVITY_RELATION_ASSIGNEE_LIST_INFO_SNAPSHOT + delegateTask.getTaskDefinitionKey(),
List.class);
// identityId_identityType
assignerList.stream().filter(i -> Objects.equals(delegateTask.getAssignee(), i.buildAssigneeId())).findFirst().ifPresent(i -> {
// 保存每个 taskId 的审批人
delegateTask.setVariable(INTERNAL_TASK_RELATION_ASSIGNEE_INFO + delegateTask.getId(), i);
// 业务指定审批人时, 添加 operationDesc
if (Objects.equals(DUMMY_ASSIGNEE_ID, i.buildAssigneeId_1_2_1())) {
taskService.addComment(delegateTask.getId(), delegateTask.getProcessInstanceId(),
COMMENT_TYPE_OPERATION_DESC, "业务指定审批人");
}
});
assignerList.stream().filter(i -> Objects.equals(delegateTask.getAssignee(), i.buildAssigneeId()))
.findFirst()
.ifPresent(i -> {
// 保存每个 taskId 的审批人
delegateTask.setVariable(INTERNAL_TASK_RELATION_ASSIGNEE_INFO + delegateTask.getId(), i);
// 业务指定审批人时, 添加 operationDesc
if (Objects.equals(DUMMY_ASSIGNEE_ID, i.buildAssigneeId_1_2_1())) {
taskService.addComment(delegateTask.getId(), delegateTask.getProcessInstanceId(),
COMMENT_TYPE_OPERATION_DESC, "业务指定审批人");
}
});
if (log.isDebugEnabled()) {
log.debug("SnapshotBpmnTaskTaskEventListener#onAssigned...end: {}", delegateTask.getTaskDefinitionKey());