From 83f542a1ab8f1b3790ce606774e7d225c20622eb Mon Sep 17 00:00:00 2001 From: yangqicheng Date: Thu, 16 Jan 2025 14:20:14 +0800 Subject: [PATCH] =?UTF-8?q?REQ-3502=20=E8=B0=83=E6=95=B4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=94=9F=E6=88=90FeignClient=E7=9A=84name=E5=80=BC=E4=B8=BAwor?= =?UTF-8?q?kflow-engine?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BpmnProcessInstanceServiceImpl.java | 9 +++------ .../workflow/support/api/CoreServiceCodeGeneration.java | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) 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 fd229d150..f30420a59 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 @@ -1082,7 +1082,7 @@ public class BpmnProcessInstanceServiceImpl implements BpmnProcessInstanceServic } } //设置任务状态 - bpmnTaskButtonVo.setExecutorTaskResult(getTaskResult(extAxHiTaskInst)); + bpmnTaskButtonVo.setExecutorTaskResult(getTaskStatus(extAxHiTaskInst)); String buttonConfigName = null; //判断节点类型 FlowElement flowElement = bpmnModel.getMainProcess().getFlowElement(extAxHiTaskInst.getTaskDefinitionKey()); @@ -1134,9 +1134,7 @@ public class BpmnProcessInstanceServiceImpl implements BpmnProcessInstanceServic executorButtons = new ArrayList<>(carbonCopyButtons); } - bpmnTaskButtonVo.setCustomHiddenButtons( - - getHiddenCustomButtons(logVO, executorButtons)); + bpmnTaskButtonVo.setCustomHiddenButtons(getHiddenCustomButtons(logVO, executorButtons)); //设置allConfigButtons List allConfigButtons = new ArrayList<>(executorButtons); bpmnTaskButtonVo.setAllConfigButtons(allConfigButtons); @@ -1163,7 +1161,7 @@ public class BpmnProcessInstanceServiceImpl implements BpmnProcessInstanceServic return bpmnTaskButtonVo; } - private BpmnProcessTaskResultEnum getTaskResult(ExtAxHiTaskInst axHiTaskInst) { + private BpmnProcessTaskResultEnum getTaskStatus(ExtAxHiTaskInst axHiTaskInst) { String logResultStatus = axHiTaskInst.getStatus(); if (!StringUtils.hasText(logResultStatus)) { log.warn("log result status is blank!"); @@ -1171,7 +1169,6 @@ public class BpmnProcessInstanceServiceImpl implements BpmnProcessInstanceServic } BpmnProcessTaskResultEnum taskResult = null; BpmnProcessInstanceResultEnum instanceResultEnum = BpmnProcessInstanceResultEnum.valueOf(logResultStatus); - switch (instanceResultEnum) { case CANCELLED: taskResult = BpmnProcessTaskResultEnum.CANCELED; diff --git a/workflow-engine-support/src/main/java/cn/axzo/workflow/support/api/CoreServiceCodeGeneration.java b/workflow-engine-support/src/main/java/cn/axzo/workflow/support/api/CoreServiceCodeGeneration.java index 685bd5110..5c4323ff9 100644 --- a/workflow-engine-support/src/main/java/cn/axzo/workflow/support/api/CoreServiceCodeGeneration.java +++ b/workflow-engine-support/src/main/java/cn/axzo/workflow/support/api/CoreServiceCodeGeneration.java @@ -171,7 +171,7 @@ public class CoreServiceCodeGeneration { "该类是根据 API 动态生成，不同版本可能会开放新的接口，或回收一些旧接口\r\n

\r\n" + "Auto generation by workflow engine, It cannot be manually modified"); classOrInterfaceDeclaration.addAndGetAnnotation("org.springframework.cloud.openfeign.FeignClient") - .addPair("name", new StringLiteralExpr("workflow-engine-starter-core")) + .addPair("name", new StringLiteralExpr("workflow-engine")) .addPair("url", new StringLiteralExpr("${axzo.service.workflow-engine:http://workflow-engine:8080}")) .addPair("configuration", new ClassExpr(new ClassOrInterfaceType("WorkflowEngineStarterFeignConfiguration"))); cu.addImport("cn.axzo.workflow.starter.feign.ext.WorkflowEngineStarterFeignConfiguration", false, false);