From b7a8fd547b29bc32d5cf4041888222f55930bfdc Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Tue, 2 Sep 2025 10:11:01 +0800 Subject: [PATCH 1/5] =?UTF-8?q?feat(REQ-4418)=20-=20=E8=B0=83=E6=95=B4=20M?= =?UTF-8?q?Q=20=E6=A3=80=E6=9F=A5=E6=8E=A7=E5=88=B6=E5=8F=B0=E8=BE=93?= =?UTF-8?q?=E5=87=BA=E7=9A=84=E6=97=A5=E5=BF=97=E7=BA=A7=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../starter/mq/check/ImplementationReadyChecker.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/mq/check/ImplementationReadyChecker.java b/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/mq/check/ImplementationReadyChecker.java index b35297be7..677b92275 100644 --- a/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/mq/check/ImplementationReadyChecker.java +++ b/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/mq/check/ImplementationReadyChecker.java @@ -82,13 +82,13 @@ public class ImplementationReadyChecker implements ApplicationListener Date: Tue, 2 Sep 2025 14:37:56 +0800 Subject: [PATCH 2/5] =?UTF-8?q?feat(REQ-4418)=20-=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E9=92=89=E9=92=89=E5=91=8A=E8=AD=A6=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/axzo/workflow/server/alter/DingTalkAlter.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/alter/DingTalkAlter.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/alter/DingTalkAlter.java index dc348e2be..55f1a30c1 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/alter/DingTalkAlter.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/alter/DingTalkAlter.java @@ -45,17 +45,17 @@ public class DingTalkAlter implements Alter { if (obj instanceof AlterDTO) { AlterDTO alterDTO = (AlterDTO) obj; if (Objects.equals(profile, "master")) { - DingTalkUtils.sendDingTalkForBizNodeAlter(profile, alterDTO, refreshProperties.getAlterMobiles()); - } else { rivenDingtalk(alterDTO); + } else { + DingTalkUtils.sendDingTalkForBizNodeAlter(profile, alterDTO, refreshProperties.getAlterMobiles()); } } if (obj instanceof NextNodePreCheckAlterDTO) { NextNodePreCheckAlterDTO alterDTO = (NextNodePreCheckAlterDTO) obj; - if(Objects.equals(profile, "master")){ - DingTalkUtils.sendDingTalkForNodePreCheck(profile, alterDTO, refreshProperties.getAlterMobiles()); - } else { + if (Objects.equals(profile, "master")) { rivenDingtalkForNodePreCheck(alterDTO); + } else { + DingTalkUtils.sendDingTalkForNodePreCheck(profile, alterDTO, refreshProperties.getAlterMobiles()); } } } From 02cd57ec7eedf8169265059b4e7f94b83abee227 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Wed, 3 Sep 2025 13:48:34 +0800 Subject: [PATCH 3/5] =?UTF-8?q?feat(REQ-4418)=20-=20=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E7=BC=96=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/axzo/workflow/server/controller/web/TestController.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/TestController.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/TestController.java index a0ab8753c..ffd36aa5c 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/TestController.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/TestController.java @@ -2,12 +2,14 @@ package cn.axzo.workflow.server.controller.web; import cn.axzo.framework.domain.ServiceException; import cn.axzo.workflow.client.feign.bpmn.ProcessInstanceApi; +import cn.axzo.workflow.common.model.dto.VariableObjectDTO; import cn.axzo.workflow.common.model.request.bpmn.process.BpmnProcessInstanceAbortDTO; import cn.axzo.workflow.common.model.request.bpmn.process.BpmnProcessInstanceQueryDTO; import cn.axzo.workflow.common.model.request.form.definition.FormContentSearchDTO; import cn.axzo.workflow.common.model.request.form.instance.FormInstanceSearchDTO; import cn.axzo.workflow.common.model.response.bpmn.process.BpmnProcessInstanceVO; import cn.axzo.workflow.common.model.response.bpmn.process.ProcessNodeDetailVO; +import cn.axzo.workflow.core.engine.cmd.CustomGetProcessInstanceVariablesToObjectCmd; import cn.axzo.workflow.core.repository.entity.ExtAxBpmnFormRelation; import cn.axzo.workflow.core.service.BpmnProcessInstanceService; import cn.axzo.workflow.core.service.ExtAxBpmnFormRelationService; @@ -22,6 +24,7 @@ import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSON; import lombok.extern.slf4j.Slf4j; import org.flowable.bpmn.model.FlowElement; +import org.flowable.common.engine.impl.interceptor.CommandExecutor; import org.flowable.common.engine.impl.util.IoUtil; import org.flowable.engine.HistoryService; import org.flowable.engine.RepositoryService; From fbf7324d8cd84a634784c9d9e2afb06eca59bc40 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Wed, 3 Sep 2025 15:31:46 +0800 Subject: [PATCH 4/5] =?UTF-8?q?feat(REQ-4418)=20-=20=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../starter/WorkflowEngineStarterAutoConfiguration.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/WorkflowEngineStarterAutoConfiguration.java b/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/WorkflowEngineStarterAutoConfiguration.java index f7bd92785..c36bd51a4 100644 --- a/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/WorkflowEngineStarterAutoConfiguration.java +++ b/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/WorkflowEngineStarterAutoConfiguration.java @@ -23,7 +23,6 @@ import cn.axzo.workflow.starter.mq.broadcast.consumer.InnerInstanceEventListener import cn.axzo.workflow.starter.mq.broadcast.consumer.InnerNotificationEventListener; import cn.axzo.workflow.starter.mq.broadcast.consumer.InnerTaskEventListener; import cn.axzo.workflow.starter.mq.broadcast.consumer.InnerWorkflowListener; -import cn.axzo.workflow.starter.mq.check.ImplementationReadyChecker; import cn.axzo.workflow.starter.mq.monitor.WorkflowEngineStarterDefaultMQMonitor; import cn.axzo.workflow.starter.mq.monitor.console.WorkflowEngineStarterMQMonitorController; import cn.axzo.workflow.starter.selector.MetaFeignClientEnableSelector; @@ -156,9 +155,9 @@ public class WorkflowEngineStarterAutoConfiguration { return new WorkflowEngineStarterDefaultMQMonitor(mqAdminExtObjectProvider, broadcastDLQProcessorObjectProvider, rpcDLQProcessorObjectProvider, workflowEngineStarterProperties, environment); } - @Bean - public ImplementationReadyChecker implementationReadyChecker() { - return new ImplementationReadyChecker(); - } +// @Bean +// public ImplementationReadyChecker implementationReadyChecker() { +// return new ImplementationReadyChecker(); +// } } From 7d6e64f337b7ae1990e2a1747c47b931c5af14c7 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Tue, 9 Sep 2025 11:24:00 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix=20-=20=E8=80=81=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=91=8A=E8=AD=A6=E5=AE=9E=E7=8E=B0=E5=A4=9A=E4=BD=99=E7=9A=84?= =?UTF-8?q?=E5=8A=A8=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workflow/core/engine/cmd/CustomActivityTriggerCmd.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomActivityTriggerCmd.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomActivityTriggerCmd.java index 2a930c561..3eb2e4b14 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomActivityTriggerCmd.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomActivityTriggerCmd.java @@ -12,7 +12,6 @@ import org.flowable.common.engine.impl.interceptor.CommandContext; import org.flowable.engine.RuntimeService; import org.flowable.engine.impl.cfg.ProcessEngineConfigurationImpl; import org.flowable.engine.impl.util.CommandContextUtil; -import org.flowable.job.service.TimerJobService; import org.flowable.engine.impl.util.ProcessDefinitionUtil; import org.flowable.task.service.impl.persistence.entity.TaskEntity; import org.slf4j.Logger; @@ -66,9 +65,6 @@ public class CustomActivityTriggerCmd extends AbstractCommand implements S addComment(commandContext, task, COMMENT_TYPE_OPERATION_DESC, "已同意"); RuntimeService runtimeService = processEngineConfiguration.getRuntimeService(); - // 告警节点生产的定时任务需要删除，否则会因为外键约束导致触发功能会重试，并抛出触发节点不存在的问题 - TimerJobService timerJobService = CommandContextUtil.getTimerJobService(); - timerJobService.findTimerJobsByProcessInstanceId(task.getProcessInstanceId()).forEach(timerJobService::deleteTimerJob); runtimeService.trigger(dto.getTriggerId()); return null; }