From 86add675c2d478d50fd834065a4e052702b302a7 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Mon, 25 Aug 2025 11:17:18 +0800 Subject: [PATCH] =?UTF-8?q?feat(REQ-4418)=20-=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E5=8D=8F=E5=8A=A9=E8=BD=AC=E6=8D=A2=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/axzo/workflow/common/code/OtherRespCode.java | 2 +- .../cmd/CustomBizSpecifyAssigneeToTaskCmd.java | 2 +- .../cmd/CustomCountersignUserTaskAsyncCmd.java | 2 +- .../engine/cmd/CustomCountersignUserTaskCmd.java | 2 +- .../core/engine/cmd/CustomCreateDummyTaskCmd.java | 12 ++++++------ .../engine/cmd/CustomResetTaskApproversAsyncCmd.java | 2 +- .../core/engine/cmd/CustomResetTaskApproversCmd.java | 2 +- .../engine/cmd/CustomTransferUserTaskAsyncCmd.java | 2 +- .../core/engine/cmd/CustomTransferUserTaskCmd.java | 2 +- .../service/impl/BpmnProcessInstanceServiceImpl.java | 2 +- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/code/OtherRespCode.java b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/code/OtherRespCode.java index e7eaef48c..c368e3a12 100644 --- a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/code/OtherRespCode.java +++ b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/code/OtherRespCode.java @@ -22,7 +22,7 @@ public enum OtherRespCode implements IModuleRespCode { ASYNC_JOB_EXECUTION_ERROR("007", "获取指定实例 ID【{}】的锁失败"), ILLEGAL_PARAM_ERROR("008", "非法的参数：【{}】"), MESSAGE_IM_EVENT_BUILD_ERROR("009", "不能使用 createEvent 函数创建`IM 消息`的事件, 请调用 createIMEvent 函数"), - ASSIGNEE_NODE_ID_NOT_EXISTS("010", "审批人 nodeId 不存在, 请检查参数是否正确") + ASSIGNEE_NODE_ID_NOT_EXISTS("010", "【{}】 nodeId 不存在, 请检查参数是否正确") ; private final String code; diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomBizSpecifyAssigneeToTaskCmd.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomBizSpecifyAssigneeToTaskCmd.java index f9a7d3bf2..1bc779eb8 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomBizSpecifyAssigneeToTaskCmd.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomBizSpecifyAssigneeToTaskCmd.java @@ -87,7 +87,7 @@ public class CustomBizSpecifyAssigneeToTaskCmd extends AbstractCommand BpmnModel bpmnModel = ProcessDefinitionUtil.getBpmnModel(task.getProcessDefinitionId()); boolean present = assigners.stream().anyMatch(assigner -> !StringUtils.hasText(assigner.getNodeId())); if (present && getCategoryVersion(bpmnModel.getMainProcess()).orElse(0) > 0) { - throw new WorkflowEngineException(ASSIGNEE_NODE_ID_NOT_EXISTS); + throw new WorkflowEngineException(ASSIGNEE_NODE_ID_NOT_EXISTS, "审批人"); } validTask(task, executionId); //校验审批人数量是否超过限制 diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomCountersignUserTaskAsyncCmd.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomCountersignUserTaskAsyncCmd.java index b9897a7f8..517958d91 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomCountersignUserTaskAsyncCmd.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomCountersignUserTaskAsyncCmd.java @@ -87,7 +87,7 @@ public class CustomCountersignUserTaskAsyncCmd extends AbstractCommand imp boolean present = dto.getTargetAssignerList().stream().anyMatch(assigner -> !org.springframework.util.StringUtils.hasText(assigner.getNodeId())); Integer categoryVersion = getCategoryVersion(bpmnModel.getMainProcess()).orElse(0); if (categoryVersion > 0 && present) { - throw new WorkflowEngineException(ASSIGNEE_NODE_ID_NOT_EXISTS); + throw new WorkflowEngineException(ASSIGNEE_NODE_ID_NOT_EXISTS, "审批人"); } } } diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomCountersignUserTaskCmd.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomCountersignUserTaskCmd.java index 634014d94..4d5f0a7ec 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomCountersignUserTaskCmd.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomCountersignUserTaskCmd.java @@ -192,7 +192,7 @@ public class CustomCountersignUserTaskCmd extends AbstractCommand implemen boolean present = targetTaskAssigneeList.stream().anyMatch(assigner -> !org.springframework.util.StringUtils.hasText(assigner.getNodeId())); Integer categoryVersion = getCategoryVersion(bpmnModel.getMainProcess()).orElse(0); if (categoryVersion > 0 && present) { - throw new WorkflowEngineException(ASSIGNEE_NODE_ID_NOT_EXISTS); + throw new WorkflowEngineException(ASSIGNEE_NODE_ID_NOT_EXISTS, "审批人"); } } } diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomCreateDummyTaskCmd.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomCreateDummyTaskCmd.java index 9bb18e82e..5db7d24f8 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomCreateDummyTaskCmd.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomCreateDummyTaskCmd.java @@ -1,9 +1,9 @@ package cn.axzo.workflow.core.engine.cmd; import cn.axzo.workflow.common.enums.BpmnProcessInstanceResultEnum; +import cn.axzo.workflow.common.exception.WorkflowEngineException; import cn.axzo.workflow.common.model.request.bpmn.task.BpmnRobotTaskCreateDTO; import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskDelegateAssigner; -import cn.axzo.workflow.common.exception.WorkflowEngineException; import cn.axzo.workflow.core.engine.cmd.helper.CustomTaskHelper; import cn.axzo.workflow.core.service.ExtAxHiTaskInstService; import com.alibaba.fastjson.JSON; @@ -30,16 +30,16 @@ import java.util.List; import java.util.Map; import java.util.Objects; +import static cn.axzo.workflow.common.code.BpmnTaskRespCode.DUMMY_TASK_CANT_CREATED; +import static cn.axzo.workflow.common.code.BpmnTaskRespCode.DUMMY_TASK_CANT_REPEAT_CREATE; +import static cn.axzo.workflow.common.code.BpmnTaskRespCode.DUMMY_TASK_CREATED_ERROR; +import static cn.axzo.workflow.common.code.BpmnTaskRespCode.DUMMY_TASK_CREATED_NOT_SUPPORT; import static cn.axzo.workflow.common.code.OtherRespCode.ASSIGNEE_NODE_ID_NOT_EXISTS; import static cn.axzo.workflow.common.constant.BpmnConstants.COMMENT_TYPE_OPERATION_DESC; import static cn.axzo.workflow.common.constant.BpmnConstants.HIDDEN_ASSIGNEE_ID; import static cn.axzo.workflow.common.constant.BpmnConstants.NO_ASSIGNEE; import static cn.axzo.workflow.common.constant.BpmnConstants.TASK_ASSIGNEE_SKIP_FLAT; import static cn.axzo.workflow.common.enums.BpmnFlowNodeType.NODE_ROBOT; -import static cn.axzo.workflow.common.code.BpmnTaskRespCode.DUMMY_TASK_CANT_CREATED; -import static cn.axzo.workflow.common.code.BpmnTaskRespCode.DUMMY_TASK_CANT_REPEAT_CREATE; -import static cn.axzo.workflow.common.code.BpmnTaskRespCode.DUMMY_TASK_CREATED_ERROR; -import static cn.axzo.workflow.common.code.BpmnTaskRespCode.DUMMY_TASK_CREATED_NOT_SUPPORT; import static cn.axzo.workflow.core.common.utils.BpmnMetaParserHelper.getCategoryVersion; import static org.flowable.task.api.Task.DEFAULT_PRIORITY; @@ -164,7 +164,7 @@ public class CustomCreateDummyTaskCmd extends AbstractCommand implements BpmnModel bpmnModel = ProcessDefinitionUtil.getBpmnModel(processDefinitionId); Integer categoryVersion = getCategoryVersion(bpmnModel.getMainProcess()).orElse(0); if (categoryVersion > 0 && !StringUtils.hasText(operator.getNodeId())) { - throw new WorkflowEngineException(ASSIGNEE_NODE_ID_NOT_EXISTS); + throw new WorkflowEngineException(ASSIGNEE_NODE_ID_NOT_EXISTS, "审批人"); } } } diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomResetTaskApproversAsyncCmd.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomResetTaskApproversAsyncCmd.java index c6573fe87..3098c7f05 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomResetTaskApproversAsyncCmd.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomResetTaskApproversAsyncCmd.java @@ -90,7 +90,7 @@ public class CustomResetTaskApproversAsyncCmd extends AbstractCommand impl boolean present = dto.getTargetAssignerList().stream().anyMatch(assigner -> !org.springframework.util.StringUtils.hasText(assigner.getNodeId())); Integer categoryVersion = getCategoryVersion(bpmnModel.getMainProcess()).orElse(0); if (categoryVersion > 0 && present) { - throw new WorkflowEngineException(ASSIGNEE_NODE_ID_NOT_EXISTS); + throw new WorkflowEngineException(ASSIGNEE_NODE_ID_NOT_EXISTS, "审批人"); } } } diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomResetTaskApproversCmd.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomResetTaskApproversCmd.java index 188b54745..71382abc6 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomResetTaskApproversCmd.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomResetTaskApproversCmd.java @@ -161,7 +161,7 @@ public class CustomResetTaskApproversCmd extends AbstractCommand implement boolean present = targetTaskAssigneeList.stream().anyMatch(assigner -> !org.springframework.util.StringUtils.hasText(assigner.getNodeId())); Integer categoryVersion = getCategoryVersion(bpmnModel.getMainProcess()).orElse(0); if (categoryVersion > 0 && present) { - throw new WorkflowEngineException(ASSIGNEE_NODE_ID_NOT_EXISTS); + throw new WorkflowEngineException(ASSIGNEE_NODE_ID_NOT_EXISTS, "审批人"); } } } diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomTransferUserTaskAsyncCmd.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomTransferUserTaskAsyncCmd.java index 30e730265..5840a9616 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomTransferUserTaskAsyncCmd.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomTransferUserTaskAsyncCmd.java @@ -88,7 +88,7 @@ public class CustomTransferUserTaskAsyncCmd extends AbstractCommand implem BpmnModel bpmnModel = ProcessDefinitionUtil.getBpmnModel(processDefinitionId); Integer categoryVersion = getCategoryVersion(bpmnModel.getMainProcess()).orElse(0); if (categoryVersion > 0 && StringUtils.isNotBlank(dto.getTargetAssigner().getNodeId())) { - throw new WorkflowEngineException(ASSIGNEE_NODE_ID_NOT_EXISTS); + throw new WorkflowEngineException(ASSIGNEE_NODE_ID_NOT_EXISTS, "审批人"); } } diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomTransferUserTaskCmd.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomTransferUserTaskCmd.java index 0ae8cbae7..6ba689abf 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomTransferUserTaskCmd.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomTransferUserTaskCmd.java @@ -133,7 +133,7 @@ public class CustomTransferUserTaskCmd extends AbstractCommand implements BpmnModel bpmnModel = ProcessDefinitionUtil.getBpmnModel(processDefinitionId); Integer categoryVersion = getCategoryVersion(bpmnModel.getMainProcess()).orElse(0); if (categoryVersion > 0 && StringUtils.isNotBlank(targetTaskAssignee.getNodeId())) { - throw new WorkflowEngineException(ASSIGNEE_NODE_ID_NOT_EXISTS); + throw new WorkflowEngineException(ASSIGNEE_NODE_ID_NOT_EXISTS, "审批人"); } } diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessInstanceServiceImpl.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessInstanceServiceImpl.java index 9146002c1..6197cf182 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessInstanceServiceImpl.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessInstanceServiceImpl.java @@ -481,7 +481,7 @@ public class BpmnProcessInstanceServiceImpl implements BpmnProcessInstanceServic throw new WorkflowEngineException(PROCESS_INSTANCE_CREATE_PARAM_ERROR); } if (!StringUtils.hasText(dto.getInitiator().getNodeId())) { - throw new WorkflowEngineException(ASSIGNEE_NODE_ID_NOT_EXISTS); + throw new WorkflowEngineException(ASSIGNEE_NODE_ID_NOT_EXISTS, "发起人"); } } categoryItemVO.ifPresent(itemVO -> {