From aa11ed3933a8863ab6377e97092a9fd36777ff72 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Wed, 18 Oct 2023 09:52:35 +0800 Subject: [PATCH] =?UTF-8?q?add=20-=20=E6=B7=BB=E5=8A=A0=E6=96=B0=E7=89=88?= =?UTF-8?q?=E7=9A=84=20JSON=20=E8=BD=AC=20BPMN=20=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workflow/core/common/utils/BpmnJsonConverterUtil.java | 2 +- .../core/converter/json/AbstractBpmnJsonConverter.java | 8 ++++---- .../core/converter/json/EndEventJsonConverter.java | 6 +----- .../converter/json/ExclusiveGatewayJsonConverter.java | 4 ---- .../workflow/core/converter/json/NotSupportConverter.java | 6 +----- .../core/converter/json/ParallelGatewayJsonConverter.java | 4 ---- .../core/converter/json/SequenceFlowJsonConverter.java | 4 ---- .../core/converter/json/ServiceTaskJsonConverter.java | 7 +------ .../core/converter/json/StartEventJsonConverter.java | 7 +------ .../core/converter/json/UserTaskJsonConverter.java | 6 +----- 10 files changed, 10 insertions(+), 44 deletions(-) diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmnJsonConverterUtil.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmnJsonConverterUtil.java index c09098e9d..0647fde4d 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmnJsonConverterUtil.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmnJsonConverterUtil.java @@ -80,7 +80,7 @@ public class BpmnJsonConverterUtil { * @return {@link BpmnJsonNode} json 格式对象,可以直接解析 */ public static BpmnJsonNode convertToJson(BpmnModel bpmnModel) { - return new BpmnJsonNode(); + throw new WorkflowEngineException("暂不支持转 JSON ,请通过获取定义查看 JSON"); } /** diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/converter/json/AbstractBpmnJsonConverter.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/converter/json/AbstractBpmnJsonConverter.java index 95ff5dbba..a86a560b2 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/converter/json/AbstractBpmnJsonConverter.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/converter/json/AbstractBpmnJsonConverter.java @@ -2,6 +2,7 @@ package cn.axzo.workflow.core.converter.json; import cn.axzo.framework.jackson.utility.JSON; import cn.axzo.workflow.common.model.request.bpmn.BpmnJsonNode; +import cn.axzo.workflow.core.common.exception.WorkflowEngineException; import org.flowable.bpmn.model.ExtensionAttribute; import org.flowable.bpmn.model.FlowElement; import org.flowable.bpmn.model.Process; @@ -16,10 +17,9 @@ import static cn.axzo.workflow.common.constant.BpmConstants.FLOW_NODE_JSON; */ public abstract class AbstractBpmnJsonConverter { - - public abstract void convertElementToJson(); - - public abstract T convertJsonToElement(BpmnJsonNode node, Process process); + public T convertJsonToElement(BpmnJsonNode node, Process process) { + throw new WorkflowEngineException("暂不支持 BPMN 转 JSON"); + } public final void addJsonValueAttribute(T t, BpmnJsonNode jsonNode) { ExtensionAttribute extensionAttribute = new ExtensionAttribute(); diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/converter/json/EndEventJsonConverter.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/converter/json/EndEventJsonConverter.java index 25331961a..7612c3f4f 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/converter/json/EndEventJsonConverter.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/converter/json/EndEventJsonConverter.java @@ -7,16 +7,12 @@ import org.flowable.bpmn.model.Process; import static cn.axzo.workflow.common.constant.BpmConstants.END_EVENT_ID; /** - * TODO + * 结束节点 * * @author wangli * @since 2023/10/13 14:47 */ public class EndEventJsonConverter extends AbstractBpmnJsonConverter { - @Override - public void convertElementToJson() { - - } @Override public EndEvent convertJsonToElement(BpmnJsonNode node, Process process) { diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/converter/json/ExclusiveGatewayJsonConverter.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/converter/json/ExclusiveGatewayJsonConverter.java index d55b4658e..c39858ca2 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/converter/json/ExclusiveGatewayJsonConverter.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/converter/json/ExclusiveGatewayJsonConverter.java @@ -14,10 +14,6 @@ import java.util.Objects; * @since 2023/10/16 20:51 */ public class ExclusiveGatewayJsonConverter extends AbstractBpmnJsonConverter { - @Override - public void convertElementToJson() { - - } @Override public ExclusiveGateway convertJsonToElement(BpmnJsonNode node, Process process) { diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/converter/json/NotSupportConverter.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/converter/json/NotSupportConverter.java index 05b14b73a..88423a964 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/converter/json/NotSupportConverter.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/converter/json/NotSupportConverter.java @@ -8,16 +8,12 @@ import org.flowable.bpmn.model.Process; import static cn.axzo.workflow.core.common.enums.BpmErrorCode.CONVERTOR_NODE_TYPE_NOT_SUPPORT; /** - * TODO + * 默认的不支持的节点转换器 * * @author wangli * @since 2023/10/13 15:13 */ public class NotSupportConverter extends AbstractBpmnJsonConverter { - @Override - public void convertElementToJson() { - - } @Override public FlowElement convertJsonToElement(BpmnJsonNode node, Process process) { diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/converter/json/ParallelGatewayJsonConverter.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/converter/json/ParallelGatewayJsonConverter.java index 28be19466..5e3d1772f 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/converter/json/ParallelGatewayJsonConverter.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/converter/json/ParallelGatewayJsonConverter.java @@ -14,10 +14,6 @@ import java.util.Objects; * @since 2023/10/16 20:51 */ public class ParallelGatewayJsonConverter extends AbstractBpmnJsonConverter { - @Override - public void convertElementToJson() { - - } @Override public ParallelGateway convertJsonToElement(BpmnJsonNode node, Process process) { diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/converter/json/SequenceFlowJsonConverter.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/converter/json/SequenceFlowJsonConverter.java index b2072053b..94a67a4fd 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/converter/json/SequenceFlowJsonConverter.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/converter/json/SequenceFlowJsonConverter.java @@ -16,10 +16,6 @@ import static cn.axzo.workflow.core.common.utils.BpmnJsonConverterUtil.id; * @since 2023/10/13 18:45 */ public class SequenceFlowJsonConverter extends AbstractBpmnJsonConverter { - @Override - public void convertElementToJson() { - - } @Override public SequenceFlow convertJsonToElement(BpmnJsonNode node, Process process) { diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/converter/json/ServiceTaskJsonConverter.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/converter/json/ServiceTaskJsonConverter.java index 80ec9bc01..4ca68035b 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/converter/json/ServiceTaskJsonConverter.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/converter/json/ServiceTaskJsonConverter.java @@ -5,17 +5,12 @@ import org.flowable.bpmn.model.Process; import org.flowable.bpmn.model.ServiceTask; /** - * TODO + * 服务任务节点 * * @author wangli * @since 2023/10/17 15:47 */ public class ServiceTaskJsonConverter extends AbstractBpmnJsonConverter { - @Override - public void convertElementToJson() { - - } - @Override public ServiceTask convertJsonToElement(BpmnJsonNode node, Process process) { ServiceTask serviceTask = new ServiceTask(); diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/converter/json/StartEventJsonConverter.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/converter/json/StartEventJsonConverter.java index 81ab01bf9..e2b2c9249 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/converter/json/StartEventJsonConverter.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/converter/json/StartEventJsonConverter.java @@ -8,18 +8,13 @@ import org.flowable.bpmn.model.StartEvent; import static cn.axzo.workflow.common.constant.BpmConstants.START_EVENT_ID; /** - * StartEvent 对象与 JSON 互转 + * 开始节点 * * @author wangli * @since 2023/10/12 11:04 */ public class StartEventJsonConverter extends AbstractBpmnJsonConverter { - @Override - public void convertElementToJson() { - - } - @Override public StartEvent convertJsonToElement(BpmnJsonNode node, Process process) { StartEvent startEvent = new StartEvent(); diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/converter/json/UserTaskJsonConverter.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/converter/json/UserTaskJsonConverter.java index f3c17debe..b4b43288e 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/converter/json/UserTaskJsonConverter.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/converter/json/UserTaskJsonConverter.java @@ -15,16 +15,12 @@ import static cn.axzo.workflow.common.enums.BpmFlowNodeType.NODE_STARTER; import static org.flowable.bpmn.model.ImplementationType.IMPLEMENTATION_TYPE_DELEGATEEXPRESSION; /** - * TODO + * 用户任务节点 * * @author wangli * @since 2023/10/13 17:01 */ public class UserTaskJsonConverter extends AbstractBpmnJsonConverter { - @Override - public void convertElementToJson() { - - } @Override public UserTask convertJsonToElement(BpmnJsonNode node, Process process) {