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

feat(REQ-2616) - 完善Activity 节点的回调,以及定时触发功能逻辑

Browse Source
This commit is contained in:
wangli 2024-09-03 18:35:20 +08:00
parent f2593e5330
commit 280e8f0de2
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/job/AsyncActivityCallbackJobHandler.java
View File

@ -21,7 +21,6 @@ import org.flowable.variable.api.delegate.VariableScope;
import java.util.Objects; import java.util.Objects;
import static cn.axzo.workflow.core.common.code.BpmnInstanceRespCode.PROCESS_INSTANCE_ID_NOT_EXISTS; import static cn.axzo.workflow.core.common.code.BpmnInstanceRespCode.PROCESS_INSTANCE_ID_NOT_EXISTS;
import static cn.axzo.workflow.core.engine.cmd.CustomBizSpecifyAssigneeToTaskCmd.getOperateTask;
/** /**
* 业务节点的触发离开的任务处理器 * 业务节点的触发离开的任务处理器
@ -45,7 +44,7 @@ public class AsyncActivityCallbackJobHandler extends AbstractJobHandler implemen
ProcessEngineConfigurationImpl processEngineConfiguration = CommandContextUtil.getProcessEngineConfiguration(commandContext); ProcessEngineConfigurationImpl processEngineConfiguration = CommandContextUtil.getProcessEngineConfiguration(commandContext);
FlowableEventDispatcher eventDispatcher = processEngineConfiguration.getEventDispatcher(); FlowableEventDispatcher eventDispatcher = processEngineConfiguration.getEventDispatcher();
TaskService taskService = processEngineConfiguration.getTaskService(); TaskService taskService = processEngineConfiguration.getTaskService();
Task task = getOperateTask(taskService, dto.getTriggerId()); Task task = taskService.createTaskQuery().executionId(dto.getTriggerId()).singleResult();
HistoryService historyService = processEngineConfiguration.getHistoryService(); HistoryService historyService = processEngineConfiguration.getHistoryService();
HistoricProcessInstance processInstance = historyService.createHistoricProcessInstanceQuery().includeProcessVariables() HistoricProcessInstance processInstance = historyService.createHistoricProcessInstanceQuery().includeProcessVariables()

4
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnProcessActivityController.java
View File

@ -120,7 +120,7 @@ public class BpmnProcessActivityController implements ProcessActivityApi {
*/ */
@PostMapping("/timeout/trigger") @PostMapping("/timeout/trigger")
@Override @Override
public CommonResponse<Boolean> setTimeoutTrigger(BpmnActivityTimeoutTriggerDTO dto) { public CommonResponse<Boolean> setTimeoutTrigger(@Validated @RequestBody BpmnActivityTimeoutTriggerDTO dto) {
return CommonResponse.success(bpmnProcessActivityService.setTimeoutTrigger(dto)); return CommonResponse.success(bpmnProcessActivityService.setTimeoutTrigger(dto));
} }
@ -132,7 +132,7 @@ public class BpmnProcessActivityController implements ProcessActivityApi {
*/ */
@PostMapping("/timeout/callback") @PostMapping("/timeout/callback")
@Override @Override
public CommonResponse<Boolean> setTimeoutCallback(BpmnActivityTimeoutCallbackDTO dto) { public CommonResponse<Boolean> setTimeoutCallback(@Validated @RequestBody BpmnActivityTimeoutCallbackDTO dto) {
return CommonResponse.success(bpmnProcessActivityService.setTimeOutCallback(dto)); return CommonResponse.success(bpmnProcessActivityService.setTimeOutCallback(dto));
} }
} }