From a7afc9524b425a00df14b816c57691adbcadd928 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Wed, 21 Feb 2024 10:59:42 +0800 Subject: [PATCH] =?UTF-8?q?update=20-=20=E8=B0=83=E6=95=B4=20API=20?= =?UTF-8?q?=E8=B0=83=E7=94=A8=E7=9A=84=E6=97=A5=E5=BF=97=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../delegate/AbstractBpmnTaskAssigneeSelector.java | 5 +++-- .../delegate/BasedIdentityTaskAssigneeSelector.java | 3 ++- .../delegate/BasedInitiatorLeaderTaskAssigneeSelector.java | 3 ++- .../delegate/BasedPositionTaskAssigneeSelector.java | 3 ++- .../controller/delegate/BasedRoleTaskAssigneeSelector.java | 3 ++- .../delegate/TransferToAdminTaskAssigneeSelector.java | 3 ++- 6 files changed, 13 insertions(+), 7 deletions(-) diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/AbstractBpmnTaskAssigneeSelector.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/AbstractBpmnTaskAssigneeSelector.java index cc4870b06..b519f806f 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/AbstractBpmnTaskAssigneeSelector.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/AbstractBpmnTaskAssigneeSelector.java @@ -71,7 +71,8 @@ public abstract class AbstractBpmnTaskAssigneeSelector implements BpmnTaskAssign return Collections.emptyList(); } - protected final T parseApiResult(Supplier> supplier, String operatorDesc, Object... param) { + protected final T parseApiResult(Supplier> supplier, String operatorDesc, + String extInfo, Object... param) { StopWatch stopWatch = new StopWatch(operatorDesc); log.info("{}-Param: {}", operatorDesc, JSONUtil.toJsonStr(param)); stopWatch.start(); @@ -81,7 +82,7 @@ public abstract class AbstractBpmnTaskAssigneeSelector implements BpmnTaskAssign Assert.notNull(result, "服务调用异常"); // 200自定义处理 if (HttpStatus.HTTP_OK != result.getCode()) { - throw new WorkflowEngineException(CALC_TASK_ASSIGNEE_ERROR, "[API:]" + result.getMsg()); + throw new WorkflowEngineException(CALC_TASK_ASSIGNEE_ERROR, "[API:" + extInfo + "]" + result.getMsg()); } return result.getData(); } diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/BasedIdentityTaskAssigneeSelector.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/BasedIdentityTaskAssigneeSelector.java index e990c487c..dda2b0f2d 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/BasedIdentityTaskAssigneeSelector.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/BasedIdentityTaskAssigneeSelector.java @@ -62,7 +62,8 @@ public class BasedIdentityTaskAssigneeSelector extends AbstractBpmnTaskAssigneeS List flowTaskAssigners = parseApiResult(() -> flowSupportApi.listTaskAssignerByIdentity(req), - "审批节点: " + userTask.getId() + ", 通过身份查询审批人", req); + "审批节点: " + userTask.getId() + ", 通过身份查询审批人", + "cn.axzo.karma.client.feign.FlowSupportApi.listTaskAssignerByIdentity", req); if (CollUtil.isEmpty(flowTaskAssigners)) { return super.invokeService(userTask, execution, scopeDto); diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/BasedInitiatorLeaderTaskAssigneeSelector.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/BasedInitiatorLeaderTaskAssigneeSelector.java index f31fd3854..8edcfe342 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/BasedInitiatorLeaderTaskAssigneeSelector.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/BasedInitiatorLeaderTaskAssigneeSelector.java @@ -71,7 +71,8 @@ public class BasedInitiatorLeaderTaskAssigneeSelector extends AbstractBpmnTaskAs List flowTaskAssigners = parseApiResult(() -> organizationalNodeUserApi.listFlowTaskAssigner(req), - "审批节点: " + userTask.getId() + ", 通过发起人主管查询审批人", req); + "审批节点: " + userTask.getId() + ", 通过发起人主管查询审批人", + "cn.axzo.maokai.api.client.OrganizationalNodeUserApi.listFlowTaskAssigner", req); if (CollUtil.isEmpty(flowTaskAssigners)) { return super.invokeService(userTask, execution, scopeDto); diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/BasedPositionTaskAssigneeSelector.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/BasedPositionTaskAssigneeSelector.java index 47bf0b544..3b8e48470 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/BasedPositionTaskAssigneeSelector.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/BasedPositionTaskAssigneeSelector.java @@ -59,7 +59,8 @@ public class BasedPositionTaskAssigneeSelector extends AbstractBpmnTaskAssigneeS List flowTaskAssigners = parseApiResult(() -> organizationalNodeUserApi.listFlowTaskAssigner(req), - "审批节点: " + userTask.getId() + ", 通过岗位查询审批人", req); + "审批节点: " + userTask.getId() + ", 通过岗位查询审批人", + "cn.axzo.maokai.api.client.OrganizationalNodeUserApi.listFlowTaskAssigner", req); if (CollUtil.isEmpty(flowTaskAssigners)) { return super.invokeService(userTask, execution, scopeDto); diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/BasedRoleTaskAssigneeSelector.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/BasedRoleTaskAssigneeSelector.java index 14bf165f5..11d557ac9 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/BasedRoleTaskAssigneeSelector.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/BasedRoleTaskAssigneeSelector.java @@ -64,7 +64,8 @@ public class BasedRoleTaskAssigneeSelector extends AbstractBpmnTaskAssigneeSelec .collect(Collectors.toList())) .build(); List flowTaskAssigners = parseApiResult(() -> tyrSaasRoleUserApi.roleUserList(param), - "审批节点: " + userTask.getId() + ", 通过角色查询审批人", param) + "审批节点: " + userTask.getId() + ", 通过角色查询审批人", + "cn.axzo.tyr.client.feign.TyrSaasRoleUserApi.roleUserList", param) .stream().filter(f -> workspaceIdSet.contains(f.getWorkspaceId())) .collect(Collectors.toList()); diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/TransferToAdminTaskAssigneeSelector.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/TransferToAdminTaskAssigneeSelector.java index 91f9d8cd1..3b4df963b 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/TransferToAdminTaskAssigneeSelector.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/delegate/TransferToAdminTaskAssigneeSelector.java @@ -65,7 +65,8 @@ public class TransferToAdminTaskAssigneeSelector extends AbstractBpmnTaskAssigne ListFlowTaskAssignerReq req = builder.build(); List flowTaskAssigners = parseApiResult(() -> flowSupportApi.listTaskAssignerAdmin(req), - "审批节点: " + userTask.getId() + ", 通过管理员查询审批人", req); + "审批节点: " + userTask.getId() + ", 通过管理员查询审批人", + "cn.axzo.karma.client.feign.FlowSupportApi.listTaskAssignerAdmin", req); if (CollUtil.isEmpty(flowTaskAssigners)) { return super.invokeService(userTask, execution, scopeDto);