From ee8156be527d3674da119016db3c63cb8e6d5c1e Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Fri, 8 Dec 2023 10:08:52 +0800 Subject: [PATCH] =?UTF-8?q?update=20-=20=E7=A7=BB=E9=99=A4=E5=A4=A7?= =?UTF-8?q?=E5=AF=B9=E8=B1=A1=E7=9A=84=E6=95=B0=E6=8D=AE=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 --- .../common/model/request/bpmn/BpmnJsonNodeProperty.java | 4 ++-- .../listener/EngineProcessInstanceEventListener.java | 2 +- .../process/MessagePushProcessEventListener.java | 9 ++++++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/BpmnJsonNodeProperty.java b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/BpmnJsonNodeProperty.java index 3ecf86561..ad32a4b19 100644 --- a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/BpmnJsonNodeProperty.java +++ b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/BpmnJsonNodeProperty.java @@ -119,9 +119,9 @@ public class BpmnJsonNodeProperty { private List groups; /** - * 条件节点专属属性: 条件组之间的计算模型,目前仅支持 and + * 条件节点专属属性: 条件组之间的计算模型,目前仅支持 or */ - @ApiModelProperty(value = "条件组之间的计算模型,目前仅支持 and") + @ApiModelProperty(value = "条件组之间的计算模型,目前仅支持 or") private String groupsType = "or"; //************* 条件节点End **************// diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineProcessInstanceEventListener.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineProcessInstanceEventListener.java index c980e509a..6001d7ea6 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineProcessInstanceEventListener.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineProcessInstanceEventListener.java @@ -134,7 +134,7 @@ public class EngineProcessInstanceEventListener extends AbstractFlowableEngineEv assigner, noticeConfig.orElse(null), processInstance.getProcessInstanceId(), processInstance.getTenantId(), null); if (log.isDebugEnabled()) { - log.debug("发送站内信: {}", com.alibaba.fastjson.JSON.toJSONString(event)); + log.debug("发送站内信: {}", com.alibaba.fastjson.JSON.toJSONString(messagePushEvent)); } eventDispatcher.dispatchEvent(messagePushEvent, processEngineConfiguration.getEngineCfgKey()); } diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/process/MessagePushProcessEventListener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/process/MessagePushProcessEventListener.java index 6de51fc6a..6835e06d7 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/process/MessagePushProcessEventListener.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/process/MessagePushProcessEventListener.java @@ -3,6 +3,7 @@ package cn.axzo.workflow.server.controller.listener.process; import cn.axzo.workflow.common.model.request.bpmn.BpmnNoticeConf; import cn.axzo.workflow.core.common.utils.BpmnMetaParserHelper; import cn.axzo.workflow.core.engine.event.MessagePushEventBuilder; +import cn.axzo.workflow.core.engine.event.MessagePushEventImpl; import cn.axzo.workflow.core.engine.event.MessagePushEventType; import cn.axzo.workflow.core.listener.BpmnProcessEventListener; import com.alibaba.fastjson.JSON; @@ -50,11 +51,13 @@ public class MessagePushProcessEventListener implements BpmnProcessEventListener Optional optNoticeConfig = BpmnMetaParserHelper.getNoticeConfig(ProcessDefinitionUtil.getProcess(event.getProcessDefinitionId())); optNoticeConfig.ifPresent(noticeConfig -> { - MessagePushEventBuilder.createEvent(MessagePushEventType.PENDING_COMPLETE, null, noticeConfig, event.getProcessInstanceId(), null, null); + MessagePushEventImpl messagePushEvent = + MessagePushEventBuilder.createEvent(MessagePushEventType.PENDING_COMPLETE, null, noticeConfig, + event.getProcessInstanceId(), null, null); if (log.isDebugEnabled()) { - log.debug("发送完成待办的消息: {}", JSON.toJSONString(event)); + log.debug("发送完成待办的消息: {}", JSON.toJSONString(messagePushEvent)); } - eventDispatcher.dispatchEvent(event, processEngineConfiguration.getEngineCfgKey()); + eventDispatcher.dispatchEvent(messagePushEvent, processEngineConfiguration.getEngineCfgKey()); }); }