From 7dd1d3e02d696c1b6e5ab6b602118cd1bb924fad Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Thu, 5 Mar 2026 19:53:18 +0800 Subject: [PATCH 1/7] =?UTF-8?q?hotfix=20-=20=E5=A4=84=E7=90=86=20MQ=20mess?= =?UTF-8?q?age=20body=20size=20=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BpmnProcessInstanceCreateWithFormDTO.java | 3 +- .../context/ActivityOperationContext.java | 2 + .../core/common/context/CommonContext.java | 9 +++ .../listener/AbstractBpmnEventListener.java | 7 +- .../impl/BpmnProcessInstanceServiceImpl.java | 4 +- ...RocketMqBpmActivityEvent_100_Listener.java | 16 ++++- .../RocketMqMessagePushEventListener.java | 17 ++++- .../RocketMqBpmnProcessEventListener.java | 71 +++++++++++++++++-- .../RocketMqBpmnTaskEvent_102_Listener.java | 63 +++++++++------- 9 files changed, 157 insertions(+), 35 deletions(-) diff --git a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/process/BpmnProcessInstanceCreateWithFormDTO.java b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/process/BpmnProcessInstanceCreateWithFormDTO.java index c8220a65f..c9e31bc89 100644 --- a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/process/BpmnProcessInstanceCreateWithFormDTO.java +++ b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/process/BpmnProcessInstanceCreateWithFormDTO.java @@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; import java.util.Map; /** @@ -14,7 +15,7 @@ import java.util.Map; */ @ApiModel("创建工作流实例同时携带表单的入参模型") @Data -public class BpmnProcessInstanceCreateWithFormDTO { +public class BpmnProcessInstanceCreateWithFormDTO implements Serializable { /** * 审批使用了表单，请一定注意传参 diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/context/ActivityOperationContext.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/context/ActivityOperationContext.java index 802dfac33..d446eaf28 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/context/ActivityOperationContext.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/context/ActivityOperationContext.java @@ -7,4 +7,6 @@ package cn.axzo.workflow.core.common.context; * @since 2024/4/12 16:43 */ public class ActivityOperationContext extends CommonContext { + + } diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/context/CommonContext.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/context/CommonContext.java index 02eeb6713..1e3c00a1a 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/context/CommonContext.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/context/CommonContext.java @@ -6,6 +6,7 @@ import cn.axzo.workflow.common.model.response.bpmn.process.BpmnProcessInstanceVO import org.flowable.bpmn.model.Process; import org.flowable.engine.repository.Deployment; import org.flowable.engine.runtime.ProcessInstance; +import org.flowable.form.model.SimpleFormModel; import org.springframework.util.StringUtils; import java.util.Objects; @@ -27,6 +28,7 @@ public abstract class CommonContext implements OperationContext { private BpmnProcessDefinitionVO definitionVO; private String processInstanceVersion; private BpmnTaskDelegateAssigner lastOperationAssigner; + private SimpleFormModel formModel; public ProcessInstance getProcessInstance(Supplier supplier) { if (Objects.isNull(processInstance)) { @@ -84,6 +86,13 @@ public abstract class CommonContext implements OperationContext { return processInstanceVersion; } + public SimpleFormModel getFormModel(Supplier supplier) { + if (Objects.isNull(formModel)) { + return supplier.get(); + } + return formModel; + } + @Override @SuppressWarnings("unchecked") public void setContext(OperationContext context) { diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/listener/AbstractBpmnEventListener.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/listener/AbstractBpmnEventListener.java index 36b6dd735..de6c9631f 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/listener/AbstractBpmnEventListener.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/listener/AbstractBpmnEventListener.java @@ -4,12 +4,14 @@ import cn.axzo.workflow.common.constant.BpmnConstants; import cn.axzo.workflow.core.common.context.OperationContext; import cn.hutool.json.JSONUtil; import org.slf4j.MDC; +import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Set; import static cn.azxo.framework.common.constatns.Constants.CTX_LOG_ID_MDC; @@ -56,7 +58,7 @@ public abstract class AbstractBpmnEventListener impl * @param originVariables * @return */ - public static Map removeBpmnConstantsVariables(Map originVariables) { + public static Map removeBpmnConstantsVariables(Map originVariables, Set removeVariableKey) { if (originVariables == null) return new HashMap<>(); // 定义需要移除的前缀列表 @@ -66,6 +68,9 @@ public abstract class AbstractBpmnEventListener impl BpmnConstants.TASK_COMPLETE_OPERATION_TYPE, BpmnConstants.INTERNAL_TASK_RELATION_ASSIGNEE_LIST_INFO ); + if (!CollectionUtils.isEmpty(removeVariableKey)) { + removeVariableKey.forEach(originVariables::remove); + } return originVariables.entrySet().stream() .filter(entry -> entry.getKey() != null) 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 c152c8fc8..ba8fa5778 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 @@ -94,6 +94,7 @@ import cn.axzo.workflow.core.service.converter.BpmnProcessInstancePageItemConver import cn.axzo.workflow.core.service.support.FlowNodeForecastService; import cn.axzo.workflow.core.service.support.ProcessGraphicService; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSON; import com.fasterxml.jackson.databind.node.ArrayNode; @@ -467,6 +468,7 @@ public class BpmnProcessInstanceServiceImpl implements BpmnProcessInstanceServic // TODO 该接口有个问题，如果模型没有关联表单，但是传入参数中含有表单变量，则不能正确创建流程 @Override public String createProcessInstance(BpmnProcessInstanceCreateDTO dto) { + BpmnProcessInstanceCreateDTO createParamDto = ObjectUtil.cloneByStream(dto); BpmnProcessDefinitionVO definition = null; if (!StringUtils.hasText(dto.getProcessDefinitionId())) { definition = processDefinitionService.getActiveProcessDefinitionByKey(dto.getProcessDefinitionKey(), dto.getTenantId()); @@ -548,7 +550,7 @@ public class BpmnProcessInstanceServiceImpl implements BpmnProcessInstanceServic instanceBuilder.outcome(dto.getOutcome()); } } - dto.getVariables().put(CREATE_INSTANCE_PARAMS, JSONUtil.toJsonStr(dto)); + dto.getVariables().put(CREATE_INSTANCE_PARAMS, JSONUtil.toJsonStr(createParamDto)); instanceBuilder.variables(dto.getVariables()); ProcessInstance instance; if (Boolean.TRUE.equals(dto.getAsync())) { diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/activity/RocketMqBpmActivityEvent_100_Listener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/activity/RocketMqBpmActivityEvent_100_Listener.java index 7477c38c1..c351517b0 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/activity/RocketMqBpmActivityEvent_100_Listener.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/activity/RocketMqBpmActivityEvent_100_Listener.java @@ -20,6 +20,9 @@ import org.flowable.engine.RepositoryService; import org.flowable.engine.RuntimeService; import org.flowable.engine.delegate.DelegateExecution; import org.flowable.engine.runtime.ProcessInstance; +import org.flowable.form.api.FormInfo; +import org.flowable.form.api.FormRepositoryService; +import org.flowable.form.model.SimpleFormModel; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Scope; import org.springframework.core.Ordered; @@ -70,6 +73,8 @@ public class RocketMqBpmActivityEvent_100_Listener extends AbstractBpmnEventList private EventProducer eventProducer; @Value("${sendMq:true}") private Boolean sendMQ; + @Resource + private FormRepositoryService formRepositoryService; @Override public void onStart(DelegateExecution execution) { @@ -175,10 +180,19 @@ public class RocketMqBpmActivityEvent_100_Listener extends AbstractBpmnEventList ProcessInstance processInstance = getContext().getProcessInstance(() -> runtimeService.createProcessInstanceQuery().processInstanceId(execution.getProcessInstanceId()) .includeProcessVariables().singleResult()); + SimpleFormModel formModel = getContext().getFormModel(() -> { + FormInfo formInfo = formRepositoryService.getFormModelByKey(processInstance.getProcessDefinitionKey(), processInstance.getTenantId(), false); + if (Objects.isNull(formInfo)) { + return null; + } else { + return (SimpleFormModel) formInfo.getFormModel(); + } + }); + if (Objects.nonNull(processInstance)) { dto.setProcessDefinitionKey(processInstance.getProcessDefinitionKey()); dto.setBusinessKey(processInstance.getBusinessKey()); - dto.setVariables(removeBpmnConstantsVariables(processInstance.getProcessVariables())); + dto.setVariables(removeBpmnConstantsVariables(processInstance.getProcessVariables(), formModel.allFieldsAsMap().keySet())); dto.setWorkflowEngineVersion(String.valueOf(processInstance.getProcessVariables() .getOrDefault(WORKFLOW_ENGINE_VERSION, FLOW_SERVER_VERSION_121))); } else { diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java index fd7f03ffc..376c70878 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java @@ -27,6 +27,9 @@ import org.flowable.engine.RuntimeService; import org.flowable.engine.TaskService; import org.flowable.engine.impl.util.CommandContextUtil; import org.flowable.engine.impl.util.ProcessDefinitionUtil; +import org.flowable.form.api.FormInfo; +import org.flowable.form.api.FormRepositoryService; +import org.flowable.form.model.SimpleFormModel; import org.flowable.task.api.history.HistoricTaskInstance; import org.flowable.task.service.impl.persistence.entity.TaskEntity; import org.springframework.beans.factory.annotation.Value; @@ -119,6 +122,8 @@ public class RocketMqMessagePushEventListener extends AbstractBpmnEventListener< private String serviceVersion; @Value("${workflow.noticeTemplateCode}") private String noticeTemplateCode; + @Resource + private FormRepositoryService formRepositoryService; private static final List REMOVE_KEYS = Lists.newArrayList( INTERNAL_INITIATOR, @@ -198,7 +203,7 @@ public class RocketMqMessagePushEventListener extends AbstractBpmnEventListener< TaskEntity task = (TaskEntity) taskService.createTaskQuery().taskId(event.getTaskId()).singleResult(); Boolean supportUpgrade = (Boolean) task.getTransientVariablesLocal().getOrDefault(SUPPORT_UPGRADE_VARIABLE, false); if (!supportUpgrade) { - buttons.removeIf(button-> Objects.equals(button.getBtnKey(), BPMN_UPGRADE.getBtnKey())); + buttons.removeIf(button -> Objects.equals(button.getBtnKey(), BPMN_UPGRADE.getBtnKey())); } dto.setButtons(buttons); sendMessageQueue(dto, PROCESS_PUSH_PENDING); @@ -421,6 +426,16 @@ public class RocketMqMessagePushEventListener extends AbstractBpmnEventListener< } }); } + SimpleFormModel formModel = getContext().getFormModel(() -> { + FormInfo formInfo = formRepositoryService.getFormModelByKey(processInstance.getProcessDefinitionKey(), processInstance.getTenantId(), false); + if (Objects.isNull(formInfo)) { + return null; + } else { + return (SimpleFormModel) formInfo.getFormModel(); + } + }); + + formModel.allFieldsAsMap().keySet().forEach(originVariables::remove); variables.putAll(originVariables); return variables; diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/process/RocketMqBpmnProcessEventListener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/process/RocketMqBpmnProcessEventListener.java index 18a77ecbb..5e945fc39 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/process/RocketMqBpmnProcessEventListener.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/process/RocketMqBpmnProcessEventListener.java @@ -19,6 +19,9 @@ import org.flowable.engine.delegate.event.FlowableProcessStartedEvent; import org.flowable.engine.delegate.event.impl.FlowableProcessCancelledEventImpl; import org.flowable.engine.impl.persistence.entity.ExecutionEntityImpl; import org.flowable.engine.repository.Deployment; +import org.flowable.form.api.FormInfo; +import org.flowable.form.api.FormRepositoryService; +import org.flowable.form.model.SimpleFormModel; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Scope; import org.springframework.core.Ordered; @@ -64,6 +67,8 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener< private RepositoryService repositoryService; @Value("${sendMq:true}") private Boolean sendMQ; + @Resource + private FormRepositoryService formRepositoryService; @Override public void onCreated(FlowableEngineEntityEvent event) { @@ -72,6 +77,15 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener< .deploymentId(((ExecutionEntityImpl) event.getEntity()).getDeploymentId()).singleResult()); Process mainProcess = getContext().getProcess(() -> repositoryService.getBpmnModel(event.getProcessDefinitionId()).getMainProcess()); BpmnTaskDelegateAssigner initiator = getContext().getInitiator(() -> BpmnTaskDelegateAssigner.toObjectCompatible(((ExecutionEntityImpl) event.getEntity()).getVariable(INTERNAL_INITIATOR))); + SimpleFormModel formModel = getContext().getFormModel(() -> { + FormInfo formInfo = formRepositoryService.getFormModelByKey(((ExecutionEntityImpl) event.getEntity()).getProcessDefinitionKey(), + ((ExecutionEntityImpl) event.getEntity()).getTenantId(), false); + if (Objects.isNull(formInfo)) { + return null; + } else { + return (SimpleFormModel) formInfo.getFormModel(); + } + }); ProcessInstanceDTO dto = new ProcessInstanceDTO() .setType(PROCESS_INSTANCE_CREATED) .setCategory(deployment.getKey()) @@ -81,7 +95,7 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener< .setProcessDefinitionKey(((ExecutionEntityImpl) event.getEntity()).getProcessDefinitionKey()) .setProcessDefinitionVersion(((ExecutionEntityImpl) event.getEntity()).getProcessDefinitionVersion()) .setInitiator(initiator) - .setVariables(removeBpmnConstantsVariables(((ExecutionEntityImpl) event.getEntity()).getVariables())) + .setVariables(removeBpmnConstantsVariables(((ExecutionEntityImpl) event.getEntity()).getVariables(), formModel.allFieldsAsMap().keySet())) .setStartTime(((ExecutionEntityImpl) event.getEntity()).getStartTime()) .setTenantId(((ExecutionEntityImpl) event.getEntity()).getTenantId()) .setBusinessKey(((ExecutionEntityImpl) event.getEntity()).getBusinessKey()) @@ -108,6 +122,15 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener< BpmnTaskDelegateAssigner initiator = getContext().getInitiator(() -> BpmnTaskDelegateAssigner.toObjectCompatible(((ExecutionEntityImpl) event.getEntity()) .getVariable(INTERNAL_INITIATOR))); + SimpleFormModel formModel = getContext().getFormModel(() -> { + FormInfo formInfo = formRepositoryService.getFormModelByKey(((ExecutionEntityImpl) event.getEntity()).getProcessDefinitionKey(), + ((ExecutionEntityImpl) event.getEntity()).getTenantId(), false); + if (Objects.isNull(formInfo)) { + return null; + } else { + return (SimpleFormModel) formInfo.getFormModel(); + } + }); ProcessInstanceDTO dto = new ProcessInstanceDTO() .setType(PROCESS_INSTANCE_STARTED) .setCategory(deployment.getKey()) @@ -117,7 +140,7 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener< .setProcessDefinitionKey(((ExecutionEntityImpl) event.getEntity()).getProcessDefinitionKey()) .setProcessDefinitionVersion(((ExecutionEntityImpl) event.getEntity()).getProcessDefinitionVersion()) .setInitiator(initiator) - .setVariables(removeBpmnConstantsVariables(((ExecutionEntityImpl) event.getEntity()).getVariables())) + .setVariables(removeBpmnConstantsVariables(((ExecutionEntityImpl) event.getEntity()).getVariables(), formModel.allFieldsAsMap().keySet())) .setStartTime(((ExecutionEntityImpl) event.getEntity()).getStartTime()) .setTenantId(((ExecutionEntityImpl) event.getEntity()).getTenantId()) .setBusinessKey(((ExecutionEntityImpl) event.getEntity()).getProcessInstance().getBusinessKey()) @@ -139,6 +162,15 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener< Process mainProcess = getContext().getProcess(() -> repositoryService.getBpmnModel(event.getProcessDefinitionId()).getMainProcess()); BpmnTaskDelegateAssigner initiator = getContext().getInitiator(() -> BpmnTaskDelegateAssigner.toObjectCompatible(((FlowableProcessCancelledEventImpl) event) .getExecution().getVariable(INTERNAL_INITIATOR))); + SimpleFormModel formModel = getContext().getFormModel(() -> { + FormInfo formInfo = formRepositoryService.getFormModelByKey(((ExecutionEntityImpl) ((FlowableProcessCancelledEventImpl) event).getExecution()).getProcessDefinitionKey(), + ((FlowableProcessCancelledEventImpl) event).getExecution().getTenantId(), false); + if (Objects.isNull(formInfo)) { + return null; + } else { + return (SimpleFormModel) formInfo.getFormModel(); + } + }); ProcessInstanceDTO dto = new ProcessInstanceDTO() .setType(PROCESS_INSTANCE_CANCELLED) @@ -151,7 +183,7 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener< .setInitiator(initiator) .setLastOperationAssigner(getContext().getLastOperationAssigner(() -> BpmnTaskDelegateAssigner.toObjectCompatible( runtimeService.getVariable(event.getProcessInstanceId(), CLOSE_PROCESS_ASSIGNER, BpmnTaskDelegateAssigner.class)))) - .setVariables(removeBpmnConstantsVariables(((FlowableProcessCancelledEventImpl) event).getExecution().getVariables())) + .setVariables(removeBpmnConstantsVariables(((FlowableProcessCancelledEventImpl) event).getExecution().getVariables(), formModel.allFieldsAsMap().keySet())) .setStartTime(((ExecutionEntityImpl) ((FlowableProcessCancelledEventImpl) event).getExecution()).getStartTime()) .setTenantId(((FlowableProcessCancelledEventImpl) event).getExecution().getTenantId()) .setBusinessKey(((FlowableProcessCancelledEventImpl) event).getExecution().getProcessInstanceBusinessKey()) @@ -181,6 +213,15 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener< BpmnTaskDelegateAssigner initiator = getContext().getInitiator(() -> BpmnTaskDelegateAssigner.toObjectCompatible(((FlowableProcessCancelledEventImpl) event) .getExecution().getVariable(INTERNAL_INITIATOR))); + SimpleFormModel formModel = getContext().getFormModel(() -> { + FormInfo formInfo = formRepositoryService.getFormModelByKey(((ExecutionEntityImpl) ((FlowableProcessCancelledEventImpl) event).getExecution()).getProcessDefinitionKey(), + ((FlowableProcessCancelledEventImpl) event).getExecution().getTenantId(), false); + if (Objects.isNull(formInfo)) { + return null; + } else { + return (SimpleFormModel) formInfo.getFormModel(); + } + }); ProcessInstanceDTO dto = new ProcessInstanceDTO() .setType(PROCESS_INSTANCE_REJECTED) .setCategory(deployment.getKey()) @@ -192,7 +233,7 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener< .setInitiator(initiator) .setLastOperationAssigner(getContext().getLastOperationAssigner(() -> BpmnTaskDelegateAssigner.toObjectCompatible( runtimeService.getVariable(event.getProcessInstanceId(), CLOSE_PROCESS_ASSIGNER, BpmnTaskDelegateAssigner.class)))) - .setVariables(removeBpmnConstantsVariables(((FlowableProcessCancelledEventImpl) event).getExecution().getVariables())) + .setVariables(removeBpmnConstantsVariables(((FlowableProcessCancelledEventImpl) event).getExecution().getVariables(), formModel.allFieldsAsMap().keySet())) .setStartTime(((ExecutionEntityImpl) ((FlowableProcessCancelledEventImpl) event).getExecution()).getStartTime()) .setTenantId(((FlowableProcessCancelledEventImpl) event).getExecution().getTenantId()) .setBusinessKey(((FlowableProcessCancelledEventImpl) event).getExecution().getProcessInstanceBusinessKey()) @@ -217,6 +258,15 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener< BpmnTaskDelegateAssigner initiator = getContext().getInitiator(() -> BpmnTaskDelegateAssigner.toObjectCompatible(((FlowableProcessCancelledEventImpl) event) .getExecution().getVariable(INTERNAL_INITIATOR))); + SimpleFormModel formModel = getContext().getFormModel(() -> { + FormInfo formInfo = formRepositoryService.getFormModelByKey(((ExecutionEntityImpl) ((FlowableProcessCancelledEventImpl) event).getExecution()).getProcessDefinitionKey(), + ((FlowableProcessCancelledEventImpl) event).getExecution().getTenantId(), false); + if (Objects.isNull(formInfo)) { + return null; + } else { + return (SimpleFormModel) formInfo.getFormModel(); + } + }); ProcessInstanceDTO dto = new ProcessInstanceDTO() .setType(PROCESS_INSTANCE_ABORTED) .setCategory(deployment.getKey()) @@ -228,7 +278,7 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener< .setInitiator(initiator) .setLastOperationAssigner(getContext().getLastOperationAssigner(() -> BpmnTaskDelegateAssigner.toObjectCompatible( runtimeService.getVariable(event.getProcessInstanceId(), CLOSE_PROCESS_ASSIGNER, BpmnTaskDelegateAssigner.class)))) - .setVariables(removeBpmnConstantsVariables(((FlowableProcessCancelledEventImpl) event).getExecution().getVariables())) + .setVariables(removeBpmnConstantsVariables(((FlowableProcessCancelledEventImpl) event).getExecution().getVariables(), formModel.allFieldsAsMap().keySet())) .setStartTime(((ExecutionEntityImpl) ((FlowableProcessCancelledEventImpl) event).getExecution()).getStartTime()) .setTenantId(((FlowableProcessCancelledEventImpl) event).getExecution().getTenantId()) .setBusinessKey(((FlowableProcessCancelledEventImpl) event).getExecution().getProcessInstanceBusinessKey()) @@ -253,6 +303,15 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener< BpmnTaskDelegateAssigner initiator = getContext().getInitiator(() -> BpmnTaskDelegateAssigner.toObjectCompatible(((ExecutionEntityImpl) event.getEntity()) .getVariable(INTERNAL_INITIATOR))); + SimpleFormModel formModel = getContext().getFormModel(() -> { + FormInfo formInfo = formRepositoryService.getFormModelByKey(((ExecutionEntityImpl) event.getEntity()).getProcessDefinitionKey(), + ((ExecutionEntityImpl) event.getEntity()).getTenantId(), false); + if (Objects.isNull(formInfo)) { + return null; + } else { + return (SimpleFormModel) formInfo.getFormModel(); + } + }); ProcessInstanceDTO dto = new ProcessInstanceDTO() .setType(PROCESS_INSTANCE_COMPLETED) .setCategory(deployment.getKey()) @@ -264,7 +323,7 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener< .setInitiator(initiator) .setLastOperationAssigner(getContext().getLastOperationAssigner(() -> BpmnTaskDelegateAssigner.toObjectCompatible( runtimeService.getVariable(event.getProcessInstanceId(), CLOSE_PROCESS_ASSIGNER, BpmnTaskDelegateAssigner.class)))) - .setVariables(removeBpmnConstantsVariables(((ExecutionEntityImpl) event.getEntity()).getVariables())) + .setVariables(removeBpmnConstantsVariables(((ExecutionEntityImpl) event.getEntity()).getVariables(), formModel.allFieldsAsMap().keySet())) .setStartTime(((ExecutionEntityImpl) event.getEntity()).getStartTime()) .setTenantId(((ExecutionEntityImpl) event.getEntity()).getTenantId()) .setBusinessKey(((ExecutionEntityImpl) event.getEntity()).getProcessInstanceBusinessKey()) diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/RocketMqBpmnTaskEvent_102_Listener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/RocketMqBpmnTaskEvent_102_Listener.java index 42e347658..dfb2a0792 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/RocketMqBpmnTaskEvent_102_Listener.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/RocketMqBpmnTaskEvent_102_Listener.java @@ -18,6 +18,9 @@ import org.flowable.engine.RuntimeService; import org.flowable.engine.TaskService; import org.flowable.engine.repository.Deployment; import org.flowable.engine.runtime.ProcessInstance; +import org.flowable.form.api.FormInfo; +import org.flowable.form.api.FormRepositoryService; +import org.flowable.form.model.SimpleFormModel; import org.flowable.task.service.delegate.DelegateTask; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Scope; @@ -78,6 +81,8 @@ public class RocketMqBpmnTaskEvent_102_Listener extends AbstractBpmnEventListene private RepositoryService repositoryService; @Value("${sendMq:true}") private Boolean sendMQ; + @Resource + private FormRepositoryService formRepositoryService; @Override public void onAssigned(DelegateTask delegateTask) { @@ -133,7 +138,7 @@ public class RocketMqBpmnTaskEvent_102_Listener extends AbstractBpmnEventListene private Deployment getDeployment(String processInstanceId) { ProcessInstance processInstance = - runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult(); + runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult(); return repositoryService.createDeploymentQuery().deploymentId(processInstance.getDeploymentId()).singleResult(); } @@ -142,26 +147,36 @@ public class RocketMqBpmnTaskEvent_102_Listener extends AbstractBpmnEventListene //1.获取当前的流程实例 ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(delegateTask.getProcessInstanceId()).singleResult(); String category = getDeployment(delegateTask.getProcessInstanceId()).getKey(); + + SimpleFormModel formModel = getContext().getFormModel(() -> { + FormInfo formInfo = formRepositoryService.getFormModelByKey(processInstance.getProcessDefinitionKey(), processInstance.getTenantId(), false); + if (Objects.isNull(formInfo)) { + return null; + } else { + return (SimpleFormModel) formInfo.getFormModel(); + } + }); + ProcessTaskDTO dto = new ProcessTaskDTO() - .setType(type) - .setCategory(category) - .setProcessDefinitionKey(category) - .setProcessTaskId(delegateTask.getId()) - .setProcessInstanceId(delegateTask.getProcessInstanceId()) - .setCurrentElementKey(delegateTask.getTaskDefinitionKey()) - .setCurrentElementName(delegateTask.getName()) - .setProcessDefinitionId(delegateTask.getProcessDefinitionId()) - .setInitiator(BpmnTaskDelegateAssigner.toObjectCompatible(delegateTask.getVariable(INTERNAL_INITIATOR))) - .setApprover(BpmnTaskDelegateAssigner.toObjectCompatible( - delegateTask.getVariable(INTERNAL_TASK_RELATION_ASSIGNEE_INFO + delegateTask.getId()))) - .setVariables(removeBpmnConstantsVariables(delegateTask.getVariables())) - .setStartTime(delegateTask.getCreateTime()) - .setTenantId(delegateTask.getTenantId()) - .setBusinessKey(processInstance.getBusinessKey()) - .setAdvice(delegateTask.getTransientVariableLocal(COMMENT_TYPE_ADVICE) == null ? null : (String) delegateTask.getTransientVariableLocal(COMMENT_TYPE_ADVICE)); + .setType(type) + .setCategory(category) + .setProcessDefinitionKey(category) + .setProcessTaskId(delegateTask.getId()) + .setProcessInstanceId(delegateTask.getProcessInstanceId()) + .setCurrentElementKey(delegateTask.getTaskDefinitionKey()) + .setCurrentElementName(delegateTask.getName()) + .setProcessDefinitionId(delegateTask.getProcessDefinitionId()) + .setInitiator(BpmnTaskDelegateAssigner.toObjectCompatible(delegateTask.getVariable(INTERNAL_INITIATOR))) + .setApprover(BpmnTaskDelegateAssigner.toObjectCompatible( + delegateTask.getVariable(INTERNAL_TASK_RELATION_ASSIGNEE_INFO + delegateTask.getId()))) + .setVariables(removeBpmnConstantsVariables(delegateTask.getVariables(), formModel.allFieldsAsMap().keySet())) + .setStartTime(delegateTask.getCreateTime()) + .setTenantId(delegateTask.getTenantId()) + .setBusinessKey(processInstance.getBusinessKey()) + .setAdvice(delegateTask.getTransientVariableLocal(COMMENT_TYPE_ADVICE) == null ? null : (String) delegateTask.getTransientVariableLocal(COMMENT_TYPE_ADVICE)); BpmnMetaParserHelper.getNoticeConfig(mainProcess).ifPresent(dto::setNoticeConf); String version = (String) runtimeService.getVariable(delegateTask.getProcessInstanceId(), - WORKFLOW_ENGINE_VERSION); + WORKFLOW_ENGINE_VERSION); if (Objects.isNull(version)) { version = FLOW_SERVER_VERSION_121; } @@ -192,12 +207,12 @@ public class RocketMqBpmnTaskEvent_102_Listener extends AbstractBpmnEventListene } } eventProducer.send(Event.builder() - .shardingKey(dto.getProcessInstanceId()) - .eventCode(eventEnum.getEventCode()) - .targetId(dto.getProcessInstanceId()) - .targetType(dto.getProcessDefinitionKey()) - .data(dto) - .build(), header); + .shardingKey(dto.getProcessInstanceId()) + .eventCode(eventEnum.getEventCode()) + .targetId(dto.getProcessInstanceId()) + .targetType(dto.getProcessDefinitionKey()) + .data(dto) + .build(), header); } From 08aea64621367ce0b84086648794522895a57ab9 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Thu, 5 Mar 2026 20:02:57 +0800 Subject: [PATCH 2/7] =?UTF-8?q?hotfix=20-=20=E5=A4=84=E7=90=86=20MQ=20mess?= =?UTF-8?q?age=20body=20size=20=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/notice/RocketMqMessagePushEventListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java index 376c70878..c6a8e63cc 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java @@ -464,7 +464,7 @@ public class RocketMqMessagePushEventListener extends AbstractBpmnEventListener< .setTemplateId(templateId) .setTaskId(event.getTaskId()) .setReceivePersons(event.getAssigners()) - .setVariables(removeBpmnConstantsVariables(variables)) + .setVariables(removeBpmnConstantsVariables(variables, null)) .setProcessApproveConf(event.getProcessApproveConfig()) .setActivitySignature(activitySignature) .setTerminalType(terminalType); From a43cce3ed05f3745a83e6edd861c18288878b237 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Thu, 5 Mar 2026 20:36:26 +0800 Subject: [PATCH 3/7] =?UTF-8?q?hotfix=20-=20=E5=A4=84=E7=90=86=20MQ=20mess?= =?UTF-8?q?age=20body=20size=20=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RocketMqBpmActivityEvent_100_Listener.java | 2 +- .../notice/RocketMqMessagePushEventListener.java | 2 +- .../process/RocketMqBpmnProcessEventListener.java | 12 ++++++------ .../task/RocketMqBpmnTaskEvent_102_Listener.java | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/activity/RocketMqBpmActivityEvent_100_Listener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/activity/RocketMqBpmActivityEvent_100_Listener.java index c351517b0..45c9313ef 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/activity/RocketMqBpmActivityEvent_100_Listener.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/activity/RocketMqBpmActivityEvent_100_Listener.java @@ -181,7 +181,7 @@ public class RocketMqBpmActivityEvent_100_Listener extends AbstractBpmnEventList runtimeService.createProcessInstanceQuery().processInstanceId(execution.getProcessInstanceId()) .includeProcessVariables().singleResult()); SimpleFormModel formModel = getContext().getFormModel(() -> { - FormInfo formInfo = formRepositoryService.getFormModelByKey(processInstance.getProcessDefinitionKey(), processInstance.getTenantId(), false); + FormInfo formInfo = formRepositoryService.getFormModelByKey(processInstance.getProcessDefinitionKey(), processInstance.getTenantId(), true); if (Objects.isNull(formInfo)) { return null; } else { diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java index c6a8e63cc..878802e1c 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java @@ -427,7 +427,7 @@ public class RocketMqMessagePushEventListener extends AbstractBpmnEventListener< }); } SimpleFormModel formModel = getContext().getFormModel(() -> { - FormInfo formInfo = formRepositoryService.getFormModelByKey(processInstance.getProcessDefinitionKey(), processInstance.getTenantId(), false); + FormInfo formInfo = formRepositoryService.getFormModelByKey(processInstance.getProcessDefinitionKey(), processInstance.getTenantId(), true); if (Objects.isNull(formInfo)) { return null; } else { diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/process/RocketMqBpmnProcessEventListener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/process/RocketMqBpmnProcessEventListener.java index 5e945fc39..940119d24 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/process/RocketMqBpmnProcessEventListener.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/process/RocketMqBpmnProcessEventListener.java @@ -79,7 +79,7 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener< BpmnTaskDelegateAssigner initiator = getContext().getInitiator(() -> BpmnTaskDelegateAssigner.toObjectCompatible(((ExecutionEntityImpl) event.getEntity()).getVariable(INTERNAL_INITIATOR))); SimpleFormModel formModel = getContext().getFormModel(() -> { FormInfo formInfo = formRepositoryService.getFormModelByKey(((ExecutionEntityImpl) event.getEntity()).getProcessDefinitionKey(), - ((ExecutionEntityImpl) event.getEntity()).getTenantId(), false); + ((ExecutionEntityImpl) event.getEntity()).getTenantId(), true); if (Objects.isNull(formInfo)) { return null; } else { @@ -124,7 +124,7 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener< SimpleFormModel formModel = getContext().getFormModel(() -> { FormInfo formInfo = formRepositoryService.getFormModelByKey(((ExecutionEntityImpl) event.getEntity()).getProcessDefinitionKey(), - ((ExecutionEntityImpl) event.getEntity()).getTenantId(), false); + ((ExecutionEntityImpl) event.getEntity()).getTenantId(), true); if (Objects.isNull(formInfo)) { return null; } else { @@ -164,7 +164,7 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener< .getExecution().getVariable(INTERNAL_INITIATOR))); SimpleFormModel formModel = getContext().getFormModel(() -> { FormInfo formInfo = formRepositoryService.getFormModelByKey(((ExecutionEntityImpl) ((FlowableProcessCancelledEventImpl) event).getExecution()).getProcessDefinitionKey(), - ((FlowableProcessCancelledEventImpl) event).getExecution().getTenantId(), false); + ((FlowableProcessCancelledEventImpl) event).getExecution().getTenantId(), true); if (Objects.isNull(formInfo)) { return null; } else { @@ -215,7 +215,7 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener< SimpleFormModel formModel = getContext().getFormModel(() -> { FormInfo formInfo = formRepositoryService.getFormModelByKey(((ExecutionEntityImpl) ((FlowableProcessCancelledEventImpl) event).getExecution()).getProcessDefinitionKey(), - ((FlowableProcessCancelledEventImpl) event).getExecution().getTenantId(), false); + ((FlowableProcessCancelledEventImpl) event).getExecution().getTenantId(), true); if (Objects.isNull(formInfo)) { return null; } else { @@ -260,7 +260,7 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener< SimpleFormModel formModel = getContext().getFormModel(() -> { FormInfo formInfo = formRepositoryService.getFormModelByKey(((ExecutionEntityImpl) ((FlowableProcessCancelledEventImpl) event).getExecution()).getProcessDefinitionKey(), - ((FlowableProcessCancelledEventImpl) event).getExecution().getTenantId(), false); + ((FlowableProcessCancelledEventImpl) event).getExecution().getTenantId(), true); if (Objects.isNull(formInfo)) { return null; } else { @@ -305,7 +305,7 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener< SimpleFormModel formModel = getContext().getFormModel(() -> { FormInfo formInfo = formRepositoryService.getFormModelByKey(((ExecutionEntityImpl) event.getEntity()).getProcessDefinitionKey(), - ((ExecutionEntityImpl) event.getEntity()).getTenantId(), false); + ((ExecutionEntityImpl) event.getEntity()).getTenantId(), true); if (Objects.isNull(formInfo)) { return null; } else { diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/RocketMqBpmnTaskEvent_102_Listener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/RocketMqBpmnTaskEvent_102_Listener.java index dfb2a0792..2c6b3f193 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/RocketMqBpmnTaskEvent_102_Listener.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/RocketMqBpmnTaskEvent_102_Listener.java @@ -149,7 +149,7 @@ public class RocketMqBpmnTaskEvent_102_Listener extends AbstractBpmnEventListene String category = getDeployment(delegateTask.getProcessInstanceId()).getKey(); SimpleFormModel formModel = getContext().getFormModel(() -> { - FormInfo formInfo = formRepositoryService.getFormModelByKey(processInstance.getProcessDefinitionKey(), processInstance.getTenantId(), false); + FormInfo formInfo = formRepositoryService.getFormModelByKey(processInstance.getProcessDefinitionKey(), processInstance.getTenantId(), true); if (Objects.isNull(formInfo)) { return null; } else { From dad2a4df6bef8bd71791884c0f889718db8f9983 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Fri, 6 Mar 2026 10:53:06 +0800 Subject: [PATCH 4/7] =?UTF-8?q?hotfix=20-=20=E5=A4=84=E7=90=86=20MQ=20mess?= =?UTF-8?q?age=20body=20size=20=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...RocketMqBpmActivityEvent_100_Listener.java | 13 ++- .../RocketMqMessagePushEventListener.java | 13 ++- .../RocketMqBpmnProcessEventListener.java | 90 ++++++++++++------- .../RocketMqBpmnTaskEvent_102_Listener.java | 13 ++- 4 files changed, 87 insertions(+), 42 deletions(-) diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/activity/RocketMqBpmActivityEvent_100_Listener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/activity/RocketMqBpmActivityEvent_100_Listener.java index 45c9313ef..ca571efa4 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/activity/RocketMqBpmActivityEvent_100_Listener.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/activity/RocketMqBpmActivityEvent_100_Listener.java @@ -181,11 +181,16 @@ public class RocketMqBpmActivityEvent_100_Listener extends AbstractBpmnEventList runtimeService.createProcessInstanceQuery().processInstanceId(execution.getProcessInstanceId()) .includeProcessVariables().singleResult()); SimpleFormModel formModel = getContext().getFormModel(() -> { - FormInfo formInfo = formRepositoryService.getFormModelByKey(processInstance.getProcessDefinitionKey(), processInstance.getTenantId(), true); - if (Objects.isNull(formInfo)) { + try { + FormInfo formInfo = formRepositoryService.getFormModelByKey(processInstance.getProcessDefinitionKey(), processInstance.getTenantId(), true); + if (Objects.isNull(formInfo)) { + return null; + } else { + return (SimpleFormModel) formInfo.getFormModel(); + } + } catch (Exception e) { + log.warn("没有找到对应业务 ID 的表单模型: {}", e.getMessage(), e); return null; - } else { - return (SimpleFormModel) formInfo.getFormModel(); } }); diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java index 878802e1c..276a23b4b 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java @@ -427,11 +427,16 @@ public class RocketMqMessagePushEventListener extends AbstractBpmnEventListener< }); } SimpleFormModel formModel = getContext().getFormModel(() -> { - FormInfo formInfo = formRepositoryService.getFormModelByKey(processInstance.getProcessDefinitionKey(), processInstance.getTenantId(), true); - if (Objects.isNull(formInfo)) { + try { + FormInfo formInfo = formRepositoryService.getFormModelByKey(processInstance.getProcessDefinitionKey(), processInstance.getTenantId(), true); + if (Objects.isNull(formInfo)) { + return null; + } else { + return (SimpleFormModel) formInfo.getFormModel(); + } + } catch (Exception e) { + log.warn("没有找到对应业务 ID 的表单模型: {}", e.getMessage(), e); return null; - } else { - return (SimpleFormModel) formInfo.getFormModel(); } }); diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/process/RocketMqBpmnProcessEventListener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/process/RocketMqBpmnProcessEventListener.java index 940119d24..7169bf545 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/process/RocketMqBpmnProcessEventListener.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/process/RocketMqBpmnProcessEventListener.java @@ -78,12 +78,17 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener< Process mainProcess = getContext().getProcess(() -> repositoryService.getBpmnModel(event.getProcessDefinitionId()).getMainProcess()); BpmnTaskDelegateAssigner initiator = getContext().getInitiator(() -> BpmnTaskDelegateAssigner.toObjectCompatible(((ExecutionEntityImpl) event.getEntity()).getVariable(INTERNAL_INITIATOR))); SimpleFormModel formModel = getContext().getFormModel(() -> { - FormInfo formInfo = formRepositoryService.getFormModelByKey(((ExecutionEntityImpl) event.getEntity()).getProcessDefinitionKey(), - ((ExecutionEntityImpl) event.getEntity()).getTenantId(), true); - if (Objects.isNull(formInfo)) { + try { + FormInfo formInfo = formRepositoryService.getFormModelByKey(((ExecutionEntityImpl) event.getEntity()).getProcessDefinitionKey(), + ((ExecutionEntityImpl) event.getEntity()).getTenantId(), true); + if (Objects.isNull(formInfo)) { + return null; + } else { + return (SimpleFormModel) formInfo.getFormModel(); + } + } catch (Exception e) { + log.warn("没有找到对应业务 ID 的表单模型: {}", e.getMessage(), e); return null; - } else { - return (SimpleFormModel) formInfo.getFormModel(); } }); ProcessInstanceDTO dto = new ProcessInstanceDTO() @@ -123,12 +128,17 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener< .getVariable(INTERNAL_INITIATOR))); SimpleFormModel formModel = getContext().getFormModel(() -> { - FormInfo formInfo = formRepositoryService.getFormModelByKey(((ExecutionEntityImpl) event.getEntity()).getProcessDefinitionKey(), - ((ExecutionEntityImpl) event.getEntity()).getTenantId(), true); - if (Objects.isNull(formInfo)) { + try { + FormInfo formInfo = formRepositoryService.getFormModelByKey(((ExecutionEntityImpl) event.getEntity()).getProcessDefinitionKey(), + ((ExecutionEntityImpl) event.getEntity()).getTenantId(), true); + if (Objects.isNull(formInfo)) { + return null; + } else { + return (SimpleFormModel) formInfo.getFormModel(); + } + } catch (Exception e) { + log.warn("没有找到对应业务 ID 的表单模型: {}", e.getMessage(), e); return null; - } else { - return (SimpleFormModel) formInfo.getFormModel(); } }); ProcessInstanceDTO dto = new ProcessInstanceDTO() @@ -163,12 +173,17 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener< BpmnTaskDelegateAssigner initiator = getContext().getInitiator(() -> BpmnTaskDelegateAssigner.toObjectCompatible(((FlowableProcessCancelledEventImpl) event) .getExecution().getVariable(INTERNAL_INITIATOR))); SimpleFormModel formModel = getContext().getFormModel(() -> { - FormInfo formInfo = formRepositoryService.getFormModelByKey(((ExecutionEntityImpl) ((FlowableProcessCancelledEventImpl) event).getExecution()).getProcessDefinitionKey(), - ((FlowableProcessCancelledEventImpl) event).getExecution().getTenantId(), true); - if (Objects.isNull(formInfo)) { + try { + FormInfo formInfo = formRepositoryService.getFormModelByKey(((ExecutionEntityImpl) ((FlowableProcessCancelledEventImpl) event).getExecution()).getProcessDefinitionKey(), + ((FlowableProcessCancelledEventImpl) event).getExecution().getTenantId(), true); + if (Objects.isNull(formInfo)) { + return null; + } else { + return (SimpleFormModel) formInfo.getFormModel(); + } + } catch (Exception e) { + log.warn("没有找到对应业务 ID 的表单模型: {}", e.getMessage(), e); return null; - } else { - return (SimpleFormModel) formInfo.getFormModel(); } }); @@ -214,12 +229,17 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener< .getExecution().getVariable(INTERNAL_INITIATOR))); SimpleFormModel formModel = getContext().getFormModel(() -> { - FormInfo formInfo = formRepositoryService.getFormModelByKey(((ExecutionEntityImpl) ((FlowableProcessCancelledEventImpl) event).getExecution()).getProcessDefinitionKey(), - ((FlowableProcessCancelledEventImpl) event).getExecution().getTenantId(), true); - if (Objects.isNull(formInfo)) { + try { + FormInfo formInfo = formRepositoryService.getFormModelByKey(((ExecutionEntityImpl) ((FlowableProcessCancelledEventImpl) event).getExecution()).getProcessDefinitionKey(), + ((FlowableProcessCancelledEventImpl) event).getExecution().getTenantId(), true); + if (Objects.isNull(formInfo)) { + return null; + } else { + return (SimpleFormModel) formInfo.getFormModel(); + } + } catch (Exception e) { + log.warn("没有找到对应业务 ID 的表单模型: {}", e.getMessage(), e); return null; - } else { - return (SimpleFormModel) formInfo.getFormModel(); } }); ProcessInstanceDTO dto = new ProcessInstanceDTO() @@ -259,12 +279,17 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener< .getExecution().getVariable(INTERNAL_INITIATOR))); SimpleFormModel formModel = getContext().getFormModel(() -> { - FormInfo formInfo = formRepositoryService.getFormModelByKey(((ExecutionEntityImpl) ((FlowableProcessCancelledEventImpl) event).getExecution()).getProcessDefinitionKey(), - ((FlowableProcessCancelledEventImpl) event).getExecution().getTenantId(), true); - if (Objects.isNull(formInfo)) { + try { + FormInfo formInfo = formRepositoryService.getFormModelByKey(((ExecutionEntityImpl) ((FlowableProcessCancelledEventImpl) event).getExecution()).getProcessDefinitionKey(), + ((FlowableProcessCancelledEventImpl) event).getExecution().getTenantId(), true); + if (Objects.isNull(formInfo)) { + return null; + } else { + return (SimpleFormModel) formInfo.getFormModel(); + } + } catch (Exception e) { + log.warn("没有找到对应业务 ID 的表单模型: {}", e.getMessage(), e); return null; - } else { - return (SimpleFormModel) formInfo.getFormModel(); } }); ProcessInstanceDTO dto = new ProcessInstanceDTO() @@ -304,12 +329,17 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener< .getVariable(INTERNAL_INITIATOR))); SimpleFormModel formModel = getContext().getFormModel(() -> { - FormInfo formInfo = formRepositoryService.getFormModelByKey(((ExecutionEntityImpl) event.getEntity()).getProcessDefinitionKey(), - ((ExecutionEntityImpl) event.getEntity()).getTenantId(), true); - if (Objects.isNull(formInfo)) { + try { + FormInfo formInfo = formRepositoryService.getFormModelByKey(((ExecutionEntityImpl) event.getEntity()).getProcessDefinitionKey(), + ((ExecutionEntityImpl) event.getEntity()).getTenantId(), true); + if (Objects.isNull(formInfo)) { + return null; + } else { + return (SimpleFormModel) formInfo.getFormModel(); + } + } catch (Exception e) { + log.warn("没有找到对应业务 ID 的表单模型: {}", e.getMessage(), e); return null; - } else { - return (SimpleFormModel) formInfo.getFormModel(); } }); ProcessInstanceDTO dto = new ProcessInstanceDTO() diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/RocketMqBpmnTaskEvent_102_Listener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/RocketMqBpmnTaskEvent_102_Listener.java index 2c6b3f193..2eed166df 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/RocketMqBpmnTaskEvent_102_Listener.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/RocketMqBpmnTaskEvent_102_Listener.java @@ -149,11 +149,16 @@ public class RocketMqBpmnTaskEvent_102_Listener extends AbstractBpmnEventListene String category = getDeployment(delegateTask.getProcessInstanceId()).getKey(); SimpleFormModel formModel = getContext().getFormModel(() -> { - FormInfo formInfo = formRepositoryService.getFormModelByKey(processInstance.getProcessDefinitionKey(), processInstance.getTenantId(), true); - if (Objects.isNull(formInfo)) { + try { + FormInfo formInfo = formRepositoryService.getFormModelByKey(processInstance.getProcessDefinitionKey(), processInstance.getTenantId(), true); + if (Objects.isNull(formInfo)) { + return null; + } else { + return (SimpleFormModel) formInfo.getFormModel(); + } + } catch (Exception e) { + log.warn("没有找到对应业务 ID 的表单模型: {}", e.getMessage(), e); return null; - } else { - return (SimpleFormModel) formInfo.getFormModel(); } }); From 1b111dff7df0d0ed02d979eee470388b6e5c7fad Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Fri, 6 Mar 2026 11:27:41 +0800 Subject: [PATCH 5/7] =?UTF-8?q?hotfix=20-=20=E5=A4=84=E7=90=86=20MQ=20mess?= =?UTF-8?q?age=20body=20size=20=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...RocketMqBpmActivityEvent_100_Listener.java | 4 ++-- .../RocketMqMessagePushEventListener.java | 4 ++-- .../RocketMqBpmnProcessEventListener.java | 24 +++++++++---------- .../RocketMqBpmnTaskEvent_102_Listener.java | 4 ++-- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/activity/RocketMqBpmActivityEvent_100_Listener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/activity/RocketMqBpmActivityEvent_100_Listener.java index ca571efa4..7fdad7324 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/activity/RocketMqBpmActivityEvent_100_Listener.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/activity/RocketMqBpmActivityEvent_100_Listener.java @@ -184,13 +184,13 @@ public class RocketMqBpmActivityEvent_100_Listener extends AbstractBpmnEventList try { FormInfo formInfo = formRepositoryService.getFormModelByKey(processInstance.getProcessDefinitionKey(), processInstance.getTenantId(), true); if (Objects.isNull(formInfo)) { - return null; + return new SimpleFormModel(); } else { return (SimpleFormModel) formInfo.getFormModel(); } } catch (Exception e) { log.warn("没有找到对应业务 ID 的表单模型: {}", e.getMessage(), e); - return null; + return new SimpleFormModel(); } }); diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java index 276a23b4b..4992e243c 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java @@ -430,13 +430,13 @@ public class RocketMqMessagePushEventListener extends AbstractBpmnEventListener< try { FormInfo formInfo = formRepositoryService.getFormModelByKey(processInstance.getProcessDefinitionKey(), processInstance.getTenantId(), true); if (Objects.isNull(formInfo)) { - return null; + return new SimpleFormModel(); } else { return (SimpleFormModel) formInfo.getFormModel(); } } catch (Exception e) { log.warn("没有找到对应业务 ID 的表单模型: {}", e.getMessage(), e); - return null; + return new SimpleFormModel(); } }); diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/process/RocketMqBpmnProcessEventListener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/process/RocketMqBpmnProcessEventListener.java index 7169bf545..2a7d7a854 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/process/RocketMqBpmnProcessEventListener.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/process/RocketMqBpmnProcessEventListener.java @@ -82,13 +82,13 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener< FormInfo formInfo = formRepositoryService.getFormModelByKey(((ExecutionEntityImpl) event.getEntity()).getProcessDefinitionKey(), ((ExecutionEntityImpl) event.getEntity()).getTenantId(), true); if (Objects.isNull(formInfo)) { - return null; + return new SimpleFormModel(); } else { return (SimpleFormModel) formInfo.getFormModel(); } } catch (Exception e) { log.warn("没有找到对应业务 ID 的表单模型: {}", e.getMessage(), e); - return null; + return new SimpleFormModel(); } }); ProcessInstanceDTO dto = new ProcessInstanceDTO() @@ -132,13 +132,13 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener< FormInfo formInfo = formRepositoryService.getFormModelByKey(((ExecutionEntityImpl) event.getEntity()).getProcessDefinitionKey(), ((ExecutionEntityImpl) event.getEntity()).getTenantId(), true); if (Objects.isNull(formInfo)) { - return null; + return new SimpleFormModel(); } else { return (SimpleFormModel) formInfo.getFormModel(); } } catch (Exception e) { log.warn("没有找到对应业务 ID 的表单模型: {}", e.getMessage(), e); - return null; + return new SimpleFormModel(); } }); ProcessInstanceDTO dto = new ProcessInstanceDTO() @@ -177,13 +177,13 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener< FormInfo formInfo = formRepositoryService.getFormModelByKey(((ExecutionEntityImpl) ((FlowableProcessCancelledEventImpl) event).getExecution()).getProcessDefinitionKey(), ((FlowableProcessCancelledEventImpl) event).getExecution().getTenantId(), true); if (Objects.isNull(formInfo)) { - return null; + return new SimpleFormModel(); } else { return (SimpleFormModel) formInfo.getFormModel(); } } catch (Exception e) { log.warn("没有找到对应业务 ID 的表单模型: {}", e.getMessage(), e); - return null; + return new SimpleFormModel(); } }); @@ -233,13 +233,13 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener< FormInfo formInfo = formRepositoryService.getFormModelByKey(((ExecutionEntityImpl) ((FlowableProcessCancelledEventImpl) event).getExecution()).getProcessDefinitionKey(), ((FlowableProcessCancelledEventImpl) event).getExecution().getTenantId(), true); if (Objects.isNull(formInfo)) { - return null; + return new SimpleFormModel(); } else { return (SimpleFormModel) formInfo.getFormModel(); } } catch (Exception e) { log.warn("没有找到对应业务 ID 的表单模型: {}", e.getMessage(), e); - return null; + return new SimpleFormModel(); } }); ProcessInstanceDTO dto = new ProcessInstanceDTO() @@ -283,13 +283,13 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener< FormInfo formInfo = formRepositoryService.getFormModelByKey(((ExecutionEntityImpl) ((FlowableProcessCancelledEventImpl) event).getExecution()).getProcessDefinitionKey(), ((FlowableProcessCancelledEventImpl) event).getExecution().getTenantId(), true); if (Objects.isNull(formInfo)) { - return null; + return new SimpleFormModel(); } else { return (SimpleFormModel) formInfo.getFormModel(); } } catch (Exception e) { log.warn("没有找到对应业务 ID 的表单模型: {}", e.getMessage(), e); - return null; + return new SimpleFormModel(); } }); ProcessInstanceDTO dto = new ProcessInstanceDTO() @@ -333,13 +333,13 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener< FormInfo formInfo = formRepositoryService.getFormModelByKey(((ExecutionEntityImpl) event.getEntity()).getProcessDefinitionKey(), ((ExecutionEntityImpl) event.getEntity()).getTenantId(), true); if (Objects.isNull(formInfo)) { - return null; + return new SimpleFormModel(); } else { return (SimpleFormModel) formInfo.getFormModel(); } } catch (Exception e) { log.warn("没有找到对应业务 ID 的表单模型: {}", e.getMessage(), e); - return null; + return new SimpleFormModel(); } }); ProcessInstanceDTO dto = new ProcessInstanceDTO() diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/RocketMqBpmnTaskEvent_102_Listener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/RocketMqBpmnTaskEvent_102_Listener.java index 2eed166df..fda6172e1 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/RocketMqBpmnTaskEvent_102_Listener.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/RocketMqBpmnTaskEvent_102_Listener.java @@ -152,13 +152,13 @@ public class RocketMqBpmnTaskEvent_102_Listener extends AbstractBpmnEventListene try { FormInfo formInfo = formRepositoryService.getFormModelByKey(processInstance.getProcessDefinitionKey(), processInstance.getTenantId(), true); if (Objects.isNull(formInfo)) { - return null; + return new SimpleFormModel(); } else { return (SimpleFormModel) formInfo.getFormModel(); } } catch (Exception e) { log.warn("没有找到对应业务 ID 的表单模型: {}", e.getMessage(), e); - return null; + return new SimpleFormModel(); } }); From fffc57ba4778cf6218fd50a92a1c302f96113b17 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Fri, 6 Mar 2026 11:49:08 +0800 Subject: [PATCH 6/7] =?UTF-8?q?hotfix=20-=20=E5=A4=84=E7=90=86=20MQ=20mess?= =?UTF-8?q?age=20body=20size=20=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RocketMqBpmActivityEvent_100_Listener.java | 2 +- .../notice/RocketMqMessagePushEventListener.java | 2 +- .../process/RocketMqBpmnProcessEventListener.java | 12 ++++++------ .../task/RocketMqBpmnTaskEvent_102_Listener.java | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/activity/RocketMqBpmActivityEvent_100_Listener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/activity/RocketMqBpmActivityEvent_100_Listener.java index 7fdad7324..549311a73 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/activity/RocketMqBpmActivityEvent_100_Listener.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/activity/RocketMqBpmActivityEvent_100_Listener.java @@ -189,7 +189,7 @@ public class RocketMqBpmActivityEvent_100_Listener extends AbstractBpmnEventList return (SimpleFormModel) formInfo.getFormModel(); } } catch (Exception e) { - log.warn("没有找到对应业务 ID 的表单模型: {}", e.getMessage(), e); + log.warn("没有找到对应业务 ID 的表单模型: {}", e.getMessage()); return new SimpleFormModel(); } }); diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java index 4992e243c..e9e815dd1 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java @@ -435,7 +435,7 @@ public class RocketMqMessagePushEventListener extends AbstractBpmnEventListener< return (SimpleFormModel) formInfo.getFormModel(); } } catch (Exception e) { - log.warn("没有找到对应业务 ID 的表单模型: {}", e.getMessage(), e); + log.warn("没有找到对应业务 ID 的表单模型: {}", e.getMessage()); return new SimpleFormModel(); } }); diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/process/RocketMqBpmnProcessEventListener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/process/RocketMqBpmnProcessEventListener.java index 2a7d7a854..450381e43 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/process/RocketMqBpmnProcessEventListener.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/process/RocketMqBpmnProcessEventListener.java @@ -87,7 +87,7 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener< return (SimpleFormModel) formInfo.getFormModel(); } } catch (Exception e) { - log.warn("没有找到对应业务 ID 的表单模型: {}", e.getMessage(), e); + log.warn("没有找到对应业务 ID 的表单模型: {}", e.getMessage()); return new SimpleFormModel(); } }); @@ -137,7 +137,7 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener< return (SimpleFormModel) formInfo.getFormModel(); } } catch (Exception e) { - log.warn("没有找到对应业务 ID 的表单模型: {}", e.getMessage(), e); + log.warn("没有找到对应业务 ID 的表单模型: {}", e.getMessage()); return new SimpleFormModel(); } }); @@ -182,7 +182,7 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener< return (SimpleFormModel) formInfo.getFormModel(); } } catch (Exception e) { - log.warn("没有找到对应业务 ID 的表单模型: {}", e.getMessage(), e); + log.warn("没有找到对应业务 ID 的表单模型: {}", e.getMessage()); return new SimpleFormModel(); } }); @@ -238,7 +238,7 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener< return (SimpleFormModel) formInfo.getFormModel(); } } catch (Exception e) { - log.warn("没有找到对应业务 ID 的表单模型: {}", e.getMessage(), e); + log.warn("没有找到对应业务 ID 的表单模型: {}", e.getMessage()); return new SimpleFormModel(); } }); @@ -288,7 +288,7 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener< return (SimpleFormModel) formInfo.getFormModel(); } } catch (Exception e) { - log.warn("没有找到对应业务 ID 的表单模型: {}", e.getMessage(), e); + log.warn("没有找到对应业务 ID 的表单模型: {}", e.getMessage()); return new SimpleFormModel(); } }); @@ -338,7 +338,7 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener< return (SimpleFormModel) formInfo.getFormModel(); } } catch (Exception e) { - log.warn("没有找到对应业务 ID 的表单模型: {}", e.getMessage(), e); + log.warn("没有找到对应业务 ID 的表单模型: {}", e.getMessage()); return new SimpleFormModel(); } }); diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/RocketMqBpmnTaskEvent_102_Listener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/RocketMqBpmnTaskEvent_102_Listener.java index fda6172e1..b63f491d9 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/RocketMqBpmnTaskEvent_102_Listener.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/RocketMqBpmnTaskEvent_102_Listener.java @@ -157,7 +157,7 @@ public class RocketMqBpmnTaskEvent_102_Listener extends AbstractBpmnEventListene return (SimpleFormModel) formInfo.getFormModel(); } } catch (Exception e) { - log.warn("没有找到对应业务 ID 的表单模型: {}", e.getMessage(), e); + log.warn("没有找到对应业务 ID 的表单模型: {}", e.getMessage()); return new SimpleFormModel(); } }); From 5e8981623fdd2a256773440a68c57c6eb5d95371 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Fri, 6 Mar 2026 17:59:50 +0800 Subject: [PATCH 7/7] =?UTF-8?q?hotfix=20-=20=E5=A4=84=E7=90=86=20MQ=20mess?= =?UTF-8?q?age=20body=20size=20=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...RocketMqBpmActivityEvent_100_Listener.java | 3 ++ .../RocketMqMessagePushEventListener.java | 3 ++ .../RocketMqBpmnProcessEventListener.java | 36 +++++++++++++++---- .../RocketMqBpmnTaskEvent_102_Listener.java | 3 ++ 4 files changed, 39 insertions(+), 6 deletions(-) diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/activity/RocketMqBpmActivityEvent_100_Listener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/activity/RocketMqBpmActivityEvent_100_Listener.java index 549311a73..a6358b550 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/activity/RocketMqBpmActivityEvent_100_Listener.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/activity/RocketMqBpmActivityEvent_100_Listener.java @@ -182,6 +182,9 @@ public class RocketMqBpmActivityEvent_100_Listener extends AbstractBpmnEventList .includeProcessVariables().singleResult()); SimpleFormModel formModel = getContext().getFormModel(() -> { try { + if (!Objects.equals("gongrendanganqianshu", processInstance.getProcessDefinitionKey())) { + return new SimpleFormModel(); + } FormInfo formInfo = formRepositoryService.getFormModelByKey(processInstance.getProcessDefinitionKey(), processInstance.getTenantId(), true); if (Objects.isNull(formInfo)) { return new SimpleFormModel(); diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java index e9e815dd1..54653b3b5 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java @@ -428,6 +428,9 @@ public class RocketMqMessagePushEventListener extends AbstractBpmnEventListener< } SimpleFormModel formModel = getContext().getFormModel(() -> { try { + if (!Objects.equals("gongrendanganqianshu", processInstance.getProcessDefinitionKey())) { + return new SimpleFormModel(); + } FormInfo formInfo = formRepositoryService.getFormModelByKey(processInstance.getProcessDefinitionKey(), processInstance.getTenantId(), true); if (Objects.isNull(formInfo)) { return new SimpleFormModel(); diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/process/RocketMqBpmnProcessEventListener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/process/RocketMqBpmnProcessEventListener.java index 450381e43..ab4e5dddd 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/process/RocketMqBpmnProcessEventListener.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/process/RocketMqBpmnProcessEventListener.java @@ -79,7 +79,11 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener< BpmnTaskDelegateAssigner initiator = getContext().getInitiator(() -> BpmnTaskDelegateAssigner.toObjectCompatible(((ExecutionEntityImpl) event.getEntity()).getVariable(INTERNAL_INITIATOR))); SimpleFormModel formModel = getContext().getFormModel(() -> { try { - FormInfo formInfo = formRepositoryService.getFormModelByKey(((ExecutionEntityImpl) event.getEntity()).getProcessDefinitionKey(), + String processDefinitionKey = ((ExecutionEntityImpl) event.getEntity()).getProcessDefinitionKey(); + if (!Objects.equals("gongrendanganqianshu", processDefinitionKey)) { + return new SimpleFormModel(); + } + FormInfo formInfo = formRepositoryService.getFormModelByKey(processDefinitionKey, ((ExecutionEntityImpl) event.getEntity()).getTenantId(), true); if (Objects.isNull(formInfo)) { return new SimpleFormModel(); @@ -129,7 +133,11 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener< SimpleFormModel formModel = getContext().getFormModel(() -> { try { - FormInfo formInfo = formRepositoryService.getFormModelByKey(((ExecutionEntityImpl) event.getEntity()).getProcessDefinitionKey(), + String processDefinitionKey = ((ExecutionEntityImpl) event.getEntity()).getProcessDefinitionKey(); + if (!Objects.equals("gongrendanganqianshu", processDefinitionKey)) { + return new SimpleFormModel(); + } + FormInfo formInfo = formRepositoryService.getFormModelByKey(processDefinitionKey, ((ExecutionEntityImpl) event.getEntity()).getTenantId(), true); if (Objects.isNull(formInfo)) { return new SimpleFormModel(); @@ -174,7 +182,11 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener< .getExecution().getVariable(INTERNAL_INITIATOR))); SimpleFormModel formModel = getContext().getFormModel(() -> { try { - FormInfo formInfo = formRepositoryService.getFormModelByKey(((ExecutionEntityImpl) ((FlowableProcessCancelledEventImpl) event).getExecution()).getProcessDefinitionKey(), + String processDefinitionKey = ((ExecutionEntityImpl) ((FlowableProcessCancelledEventImpl) event).getExecution()).getProcessDefinitionKey(); + if (!Objects.equals("gongrendanganqianshu", processDefinitionKey)) { + return new SimpleFormModel(); + } + FormInfo formInfo = formRepositoryService.getFormModelByKey(processDefinitionKey, ((FlowableProcessCancelledEventImpl) event).getExecution().getTenantId(), true); if (Objects.isNull(formInfo)) { return new SimpleFormModel(); @@ -230,7 +242,11 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener< SimpleFormModel formModel = getContext().getFormModel(() -> { try { - FormInfo formInfo = formRepositoryService.getFormModelByKey(((ExecutionEntityImpl) ((FlowableProcessCancelledEventImpl) event).getExecution()).getProcessDefinitionKey(), + String processDefinitionKey = ((ExecutionEntityImpl) ((FlowableProcessCancelledEventImpl) event).getExecution()).getProcessDefinitionKey(); + if (!Objects.equals("gongrendanganqianshu", processDefinitionKey)) { + return new SimpleFormModel(); + } + FormInfo formInfo = formRepositoryService.getFormModelByKey(processDefinitionKey, ((FlowableProcessCancelledEventImpl) event).getExecution().getTenantId(), true); if (Objects.isNull(formInfo)) { return new SimpleFormModel(); @@ -280,7 +296,11 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener< SimpleFormModel formModel = getContext().getFormModel(() -> { try { - FormInfo formInfo = formRepositoryService.getFormModelByKey(((ExecutionEntityImpl) ((FlowableProcessCancelledEventImpl) event).getExecution()).getProcessDefinitionKey(), + String processDefinitionKey = ((ExecutionEntityImpl) ((FlowableProcessCancelledEventImpl) event).getExecution()).getProcessDefinitionKey(); + if (!Objects.equals("gongrendanganqianshu", processDefinitionKey)) { + return new SimpleFormModel(); + } + FormInfo formInfo = formRepositoryService.getFormModelByKey(processDefinitionKey, ((FlowableProcessCancelledEventImpl) event).getExecution().getTenantId(), true); if (Objects.isNull(formInfo)) { return new SimpleFormModel(); @@ -330,7 +350,11 @@ public class RocketMqBpmnProcessEventListener extends AbstractBpmnEventListener< SimpleFormModel formModel = getContext().getFormModel(() -> { try { - FormInfo formInfo = formRepositoryService.getFormModelByKey(((ExecutionEntityImpl) event.getEntity()).getProcessDefinitionKey(), + String processDefinitionKey = ((ExecutionEntityImpl) event.getEntity()).getProcessDefinitionKey(); + if (!Objects.equals("gongrendanganqianshu", processDefinitionKey)) { + return new SimpleFormModel(); + } + FormInfo formInfo = formRepositoryService.getFormModelByKey(processDefinitionKey, ((ExecutionEntityImpl) event.getEntity()).getTenantId(), true); if (Objects.isNull(formInfo)) { return new SimpleFormModel(); diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/RocketMqBpmnTaskEvent_102_Listener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/RocketMqBpmnTaskEvent_102_Listener.java index b63f491d9..553c0775d 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/RocketMqBpmnTaskEvent_102_Listener.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/RocketMqBpmnTaskEvent_102_Listener.java @@ -150,6 +150,9 @@ public class RocketMqBpmnTaskEvent_102_Listener extends AbstractBpmnEventListene SimpleFormModel formModel = getContext().getFormModel(() -> { try { + if (!Objects.equals("gongrendanganqianshu", processInstance.getProcessDefinitionKey())) { + return new SimpleFormModel(); + } FormInfo formInfo = formRepositoryService.getFormModelByKey(processInstance.getProcessDefinitionKey(), processInstance.getTenantId(), true); if (Objects.isNull(formInfo)) { return new SimpleFormModel();