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

Merge branch 'refs/heads/master' into feature/starter

Browse Source 
# Conflicts:
#	workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnProcessActivityController.java
This commit is contained in:
wangli 2024-06-06 14:01:30 +08:00
commit f71a58e672
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,6 +54,7 @@ public class BpmnProcessActivityController implements ProcessActivityApi {
@RepeatSubmit
public CommonResponse<Boolean> trigger(@RequestParam @NotBlank(message = "触发 ID 不能为空") String triggerId,
@RequestParam(required = false, defaultValue = "false") Boolean async) {
log.info("业务节点唤醒 trigger ===>>>参数：{}, {}", triggerId, async);
if (async != null && async) {
bpmnProcessActivityService.triggerAsync(triggerId);
} else {
@ -67,7 +68,8 @@ public class BpmnProcessActivityController implements ProcessActivityApi {
@Override
@RepeatSubmit
public CommonResponse<Boolean> trigger(@NotBlank(message = "触发 ID 不能为空") @RequestParam String triggerId) {
return trigger(triggerId, true);
log.info("业务节点唤醒 trigger2 ===>>>参数：{}", triggerId);
return trigger(triggerId, false);
}
/**
@ -83,6 +85,7 @@ public class BpmnProcessActivityController implements ProcessActivityApi {
@Override
@RepeatSubmit
public CommonResponse<Boolean> setAssignee(@Validated @RequestBody BpmnActivitySetAssigneeDTO dto) {
log.info("业务节点设置审批人 setAssignee ===>>>参数：{}", dto);
if (!dto.getServerSideDeduplication()) {
List<String> personIds = new ArrayList<>();
for (BpmnTaskDelegateAssigner assigner : dto.getAssigners()) {

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

@ -34,6 +34,7 @@ public class BpmnProcessJobController implements ProcessJobApi {
@Override
@GetMapping("/dead-letter/resume")
public CommonResponse<Void> executeDeadLetterJobAction(@RequestParam String jobId, @RequestParam String procInstId) {
log.info("将死信任务重新激活 executeDeadLetterJobAction ===>>>参数：{}, {}", jobId, procInstId);
if (StringUtils.isBlank(jobId) && StringUtils.isBlank(procInstId)) {
throw new WorkflowEngineException(RESUME_JOB_REQUEST_PARAM_ERROR);
}

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

@ -150,6 +150,7 @@ public class BpmnProcessTaskController implements ProcessTaskApi {
@Override
@RepeatSubmit
public CommonResponse<Boolean> transferTask(@Validated @RequestBody BpmnTaskTransferDTO dto) {
log.info("转交任务 transferTask===>>>参数：{}", dto);
bpmnProcessTaskService.transferTask(dto);
return success(true);
}
@ -159,6 +160,7 @@ public class BpmnProcessTaskController implements ProcessTaskApi {
@Override
@RepeatSubmit
public CommonResponse<BatchOperationResultVO> batchTransferTask(@Validated @RequestBody List<BpmnTaskTransferDTO> dtos) {
log.info("批量转交任务 batchTransferTask===>>>参数：{}", dtos);
return success(bpmnProcessTaskService.batchTransferTask(dtos));
}
@ -170,6 +172,7 @@ public class BpmnProcessTaskController implements ProcessTaskApi {
@Override
@RepeatSubmit
public CommonResponse<Boolean> commentTask(@Validated @RequestBody BpmnTaskCommentDTO commentDTO) {
log.info("评论流程实例 commentTask===>>>参数：{}", commentDTO);
bpmnProcessTaskService.commentTask(commentDTO);
return success(true);
}
@ -183,6 +186,7 @@ public class BpmnProcessTaskController implements ProcessTaskApi {
@PostMapping("/countersign")
@RepeatSubmit
public CommonResponse<Boolean> countersignTask(@Validated @RequestBody BpmnTaskCountersignDTO countersignDTO) {
log.info("加签任务 countersignTask===>>>参数：{}", countersignDTO);
bpmnProcessTaskService.countersignTask(countersignDTO);
return success(true);
}
@ -198,6 +202,7 @@ public class BpmnProcessTaskController implements ProcessTaskApi {
@Override
@RepeatSubmit
public CommonResponse<Boolean> remindTask(@Validated @RequestBody BpmnTaskRemindDTO dto) {
log.info("催办任务 remindTask===>>>参数：{}", dto);
bpmnProcessTaskService.remindTask(dto);
return success(true);
}
@ -213,6 +218,7 @@ public class BpmnProcessTaskController implements ProcessTaskApi {
@Override
@RepeatSubmit
public CommonResponse<String> createRobotTask(@Validated @RequestBody BpmnRobotTaskCreateDTO dto) {
log.info("创建机器人节点, 暂停流程任务 createRobotTask===>>>参数：{}", dto);
return success(bpmnProcessTaskService.createRobotTask(dto));
}
@ -227,6 +233,7 @@ public class BpmnProcessTaskController implements ProcessTaskApi {
@Override
@RepeatSubmit
public CommonResponse<Boolean> completeRobotTask(@Validated @RequestBody BpmnRobotTaskCompleteDTO dto) {
log.info("完成机器人节点, 继续流程任务 completeRobotTask===>>>参数：{}", dto);
bpmnProcessTaskService.completeRobotTask(dto);
return success(true);
}