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

REQ-3502 调整代码生成FeignClient的name值为workflow-engine

Browse Source
This commit is contained in:
yangqicheng 2025-01-16 14:20:14 +08:00
parent 62d218ddf1
commit 83f542a1ab
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessInstanceServiceImpl.java
View File

@ -1082,7 +1082,7 @@ public class BpmnProcessInstanceServiceImpl implements BpmnProcessInstanceServic
} }
} }
//设置任务状态 //设置任务状态
bpmnTaskButtonVo.setExecutorTaskResult(getTaskResult(extAxHiTaskInst)); bpmnTaskButtonVo.setExecutorTaskResult(getTaskStatus(extAxHiTaskInst));
String buttonConfigName = null; String buttonConfigName = null;
//判断节点类型 //判断节点类型
FlowElement flowElement = bpmnModel.getMainProcess().getFlowElement(extAxHiTaskInst.getTaskDefinitionKey()); FlowElement flowElement = bpmnModel.getMainProcess().getFlowElement(extAxHiTaskInst.getTaskDefinitionKey());
@ -1134,9 +1134,7 @@ public class BpmnProcessInstanceServiceImpl implements BpmnProcessInstanceServic
executorButtons = new ArrayList<>(carbonCopyButtons); executorButtons = new ArrayList<>(carbonCopyButtons);
} }
bpmnTaskButtonVo.setCustomHiddenButtons( bpmnTaskButtonVo.setCustomHiddenButtons(getHiddenCustomButtons(logVO, executorButtons));
getHiddenCustomButtons(logVO, executorButtons));
//设置allConfigButtons //设置allConfigButtons
List<BpmnButtonMetaInfo> allConfigButtons = new ArrayList<>(executorButtons); List<BpmnButtonMetaInfo> allConfigButtons = new ArrayList<>(executorButtons);
bpmnTaskButtonVo.setAllConfigButtons(allConfigButtons); bpmnTaskButtonVo.setAllConfigButtons(allConfigButtons);
@ -1163,7 +1161,7 @@ public class BpmnProcessInstanceServiceImpl implements BpmnProcessInstanceServic
return bpmnTaskButtonVo; return bpmnTaskButtonVo;
} }
private BpmnProcessTaskResultEnum getTaskResult(ExtAxHiTaskInst axHiTaskInst) { private BpmnProcessTaskResultEnum getTaskStatus(ExtAxHiTaskInst axHiTaskInst) {
String logResultStatus = axHiTaskInst.getStatus(); String logResultStatus = axHiTaskInst.getStatus();
if (!StringUtils.hasText(logResultStatus)) { if (!StringUtils.hasText(logResultStatus)) {
log.warn("log result status is blank!"); log.warn("log result status is blank!");
@ -1171,7 +1169,6 @@ public class BpmnProcessInstanceServiceImpl implements BpmnProcessInstanceServic
} }
BpmnProcessTaskResultEnum taskResult = null; BpmnProcessTaskResultEnum taskResult = null;
BpmnProcessInstanceResultEnum instanceResultEnum = BpmnProcessInstanceResultEnum.valueOf(logResultStatus); BpmnProcessInstanceResultEnum instanceResultEnum = BpmnProcessInstanceResultEnum.valueOf(logResultStatus);
switch (instanceResultEnum) { switch (instanceResultEnum) {
case CANCELLED: case CANCELLED:
taskResult = BpmnProcessTaskResultEnum.CANCELED; taskResult = BpmnProcessTaskResultEnum.CANCELED;

2
workflow-engine-support/src/main/java/cn/axzo/workflow/support/api/CoreServiceCodeGeneration.java
View File

@ -171,7 +171,7 @@ public class CoreServiceCodeGeneration {
"该类是根据 API 动态生成，不同版本可能会开放新的接口，或回收一些旧接口\r\n<p>\r\n" + "该类是根据 API 动态生成，不同版本可能会开放新的接口，或回收一些旧接口\r\n<p>\r\n" +
"Auto generation by workflow engine, It cannot be manually modified"); "Auto generation by workflow engine, It cannot be manually modified");
classOrInterfaceDeclaration.addAndGetAnnotation("org.springframework.cloud.openfeign.FeignClient") 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("url", new StringLiteralExpr("${axzo.service.workflow-engine:http://workflow-engine:8080}"))
.addPair("configuration", new ClassExpr(new ClassOrInterfaceType("WorkflowEngineStarterFeignConfiguration"))); .addPair("configuration", new ClassExpr(new ClassOrInterfaceType("WorkflowEngineStarterFeignConfiguration")));
cu.addImport("cn.axzo.workflow.starter.feign.ext.WorkflowEngineStarterFeignConfiguration", false, false); cu.addImport("cn.axzo.workflow.starter.feign.ext.WorkflowEngineStarterFeignConfiguration", false, false);