From 656b2c371bd14b5c1f03724a006f06bde84ae536 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Mon, 22 Jul 2024 21:12:22 +0800 Subject: [PATCH] =?UTF-8?q?add=20-=20=E6=96=B0=E5=A2=9E=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/BpmnProcessModelServiceImpl.java | 3 + .../src/main/resources/convertorXML.bpmn | 2440 ++++------------- 2 files changed, 577 insertions(+), 1866 deletions(-) diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessModelServiceImpl.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessModelServiceImpl.java index e48bf26e2..de8ef5c0e 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessModelServiceImpl.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessModelServiceImpl.java @@ -16,6 +16,7 @@ import cn.axzo.workflow.core.service.BpmnProcessModelService; import cn.axzo.workflow.core.service.ExtAxReModelService; import cn.axzo.workflow.core.service.converter.BpmnModelConverter; import cn.hutool.json.JSONUtil; +import lombok.extern.slf4j.Slf4j; import org.flowable.bpmn.converter.BpmnXMLConverter; import org.flowable.bpmn.model.BpmnModel; import org.flowable.common.engine.impl.db.SuspensionState; @@ -61,6 +62,7 @@ import static cn.axzo.workflow.core.common.utils.BpmnNativeQueryUtil.countSql; import static cn.axzo.workflow.core.common.utils.BpmnNativeQueryUtil.sqlConnectors; @Service +@Slf4j public class BpmnProcessModelServiceImpl implements BpmnProcessModelService { @Resource @@ -169,6 +171,7 @@ public class BpmnProcessModelServiceImpl implements BpmnProcessModelService { (s, t) -> s)).forEach((k, v) -> vos.forEach(i -> { if (Objects.equals(i.getDeploymentId(), k)) { i.setVersion(v.getVersion()); + log.info("获取 BpmnModel: {}", v.getId()); i.setBpmJson(BpmnJsonConverterUtil.convertToJson(repositoryService.getBpmnModel(v.getId()))); } })); diff --git a/workflow-engine-server/src/main/resources/convertorXML.bpmn b/workflow-engine-server/src/main/resources/convertorXML.bpmn index 6da5d351d..4ef28a27e 100644 --- a/workflow-engine-server/src/main/resources/convertorXML.bpmn +++ b/workflow-engine-server/src/main/resources/convertorXML.bpmn @@ -4,15 +4,15 @@ xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath" - targetNamespace="http://www.flowable.org/test"> - - remark + targetNamespace="order"> + + 创建/拆分任务时使用的审批流 - - + + @@ -20,7 +20,7 @@