From 89160079dc880f97be6c09305ca4078a29e90402 Mon Sep 17 00:00:00 2001 From: gulongcheng <474084054@qq.com> Date: Fri, 23 Jan 2026 16:36:21 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"fix:=E6=B5=81=E7=A8=8B=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E5=AE=8C=E6=88=90=EF=BC=8C=E6=9B=B4=E6=96=B0=E7=AE=97?= =?UTF-8?q?=E5=88=97=E7=8A=B6=E6=80=81"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 7e76f27c423c0b5056cfdf7825ea398c1b3d0e04. --- .idea/MarsCodeWorkspaceAppSettings.xml | 6 -- .../project/SimulationRunFeignClientImpl.java | 11 ---- .../project/ISimulationRunFeignClient.java | 10 ---- .../flowable/listener/ProcessEndListener.java | 56 ------------------- .../sdm/flowable/util/Dto2BpmnConverter.java | 8 --- .../controller/SimulationRunController.java | 13 ----- .../service/ISimulationRunService.java | 9 --- .../impl/SimulationRunServiceImpl.java | 40 ------------- 8 files changed, 153 deletions(-) delete mode 100644 .idea/MarsCodeWorkspaceAppSettings.xml delete mode 100644 flowable/src/main/java/com/sdm/flowable/listener/ProcessEndListener.java diff --git a/.idea/MarsCodeWorkspaceAppSettings.xml b/.idea/MarsCodeWorkspaceAppSettings.xml deleted file mode 100644 index e2a065b7..00000000 --- a/.idea/MarsCodeWorkspaceAppSettings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/common/src/main/java/com/sdm/common/feign/impl/project/SimulationRunFeignClientImpl.java b/common/src/main/java/com/sdm/common/feign/impl/project/SimulationRunFeignClientImpl.java index f1ef16ac..06e5f619 100644 --- a/common/src/main/java/com/sdm/common/feign/impl/project/SimulationRunFeignClientImpl.java +++ b/common/src/main/java/com/sdm/common/feign/impl/project/SimulationRunFeignClientImpl.java @@ -51,15 +51,4 @@ public class SimulationRunFeignClientImpl implements ISimulationRunFeignClient { return SdmResponse.failed("内部调用生成自动化报告失败"); } } - - @Override - public SdmResponse completeRunByFlowInstanceId(String flowInstanceId) { - try { - simulationRunFeignClient.completeRunByFlowInstanceId(flowInstanceId); - return SdmResponse.success(); - }catch (Exception e){ - log.error("根据流程实例ID完成算列失败", e); - return SdmResponse.failed("根据流程实例ID完成算列失败"); - } - } } diff --git a/common/src/main/java/com/sdm/common/feign/inter/project/ISimulationRunFeignClient.java b/common/src/main/java/com/sdm/common/feign/inter/project/ISimulationRunFeignClient.java index ff6fc588..f7d9303f 100644 --- a/common/src/main/java/com/sdm/common/feign/inter/project/ISimulationRunFeignClient.java +++ b/common/src/main/java/com/sdm/common/feign/inter/project/ISimulationRunFeignClient.java @@ -26,14 +26,4 @@ public interface ISimulationRunFeignClient { @PostMapping("/run/generateReportInternal") SdmResponse generateReportInternal(@RequestBody SpdmReportReq req); - /** - * 根据流程实例ID完成算列(将状态更新为完成) - * 由Flowable流程结束监听器调用 - * - * @param flowInstanceId 流程实例ID - * @return SdmResponse - */ - @PostMapping("/run/completeRunByFlowInstanceId") - SdmResponse completeRunByFlowInstanceId(@RequestParam("flowInstanceId") String flowInstanceId); - } \ No newline at end of file diff --git a/flowable/src/main/java/com/sdm/flowable/listener/ProcessEndListener.java b/flowable/src/main/java/com/sdm/flowable/listener/ProcessEndListener.java deleted file mode 100644 index 585c3357..00000000 --- a/flowable/src/main/java/com/sdm/flowable/listener/ProcessEndListener.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.sdm.flowable.listener; - -import com.sdm.common.common.SdmResponse; -import com.sdm.common.feign.inter.project.ISimulationRunFeignClient; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.flowable.engine.delegate.DelegateExecution; -import org.flowable.engine.delegate.ExecutionListener; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 流程结束监听器 - * 当流程执行到结束事件(EndEvent)时触发，自动更新算列表(SimulationRun)的状态为完成 - */ -@Slf4j -@Component("processEndListener") -public class ProcessEndListener implements ExecutionListener { - - @Autowired - private ISimulationRunFeignClient simulationRunFeignClient; - - @Override - public void notify(DelegateExecution execution) { - try { - // 获取流程变量 - String runId = (String) execution.getVariable("runId"); - String processInstanceId = execution.getProcessInstanceId(); - String processDefinitionId = execution.getProcessDefinitionId(); - - log.info("流程结束监听器触发 - 流程实例ID: {}, 流程定义ID: {}, runId: {}", - processInstanceId, processDefinitionId, runId); - - // 校验必要参数 - if (StringUtils.isBlank(runId)) { - log.warn("流程结束监听器: runId为空，无法更新算列表状态。流程实例ID: {}", processInstanceId); - return; - } - - // 调用project服务更新算列表状态为完成 - SdmResponse response = simulationRunFeignClient.completeRunByFlowInstanceId(processInstanceId); - - if (response.isSuccess()) { - log.info("流程结束监听器: 算列表状态更新成功 - runId: {}, 流程实例ID: {}", runId, processInstanceId); - } else { - log.error("流程结束监听器: 算列表状态更新失败 - runId: {}, 流程实例ID: {}, 错误信息: {}", - runId, processInstanceId, response.getMessage()); - } - - } catch (Exception e) { - // 异常不应该影响流程的正常结束，只记录日志 - log.error("流程结束监听器执行异常 - 流程实例ID: {}, 异常信息: {}", - execution.getProcessInstanceId(), e.getMessage(), e); - } - } -} diff --git a/flowable/src/main/java/com/sdm/flowable/util/Dto2BpmnConverter.java b/flowable/src/main/java/com/sdm/flowable/util/Dto2BpmnConverter.java index 46da82ea..4e5860f9 100644 --- a/flowable/src/main/java/com/sdm/flowable/util/Dto2BpmnConverter.java +++ b/flowable/src/main/java/com/sdm/flowable/util/Dto2BpmnConverter.java @@ -511,14 +511,6 @@ public class Dto2BpmnConverter { EndEvent endEvent = new EndEvent(); endEvent.setId(nodeDto.getId()); endEvent.setName(nodeDto.getName()); - - // 添加流程结束监听器，在进入结束节点时触发 - FlowableListener processEndListener = new FlowableListener(); - processEndListener.setEvent("start"); // 进入结束节点时触发 - processEndListener.setImplementationType(ImplementationType.IMPLEMENTATION_TYPE_DELEGATEEXPRESSION); - processEndListener.setImplementation("${processEndListener}"); - endEvent.getExecutionListeners().add(processEndListener); - process.addFlowElement(endEvent); log.info("创建结束事件节点 nodeId：{}", nodeDto.getId()); break; diff --git a/project/src/main/java/com/sdm/project/controller/SimulationRunController.java b/project/src/main/java/com/sdm/project/controller/SimulationRunController.java index b28f1efe..800b2bd8 100644 --- a/project/src/main/java/com/sdm/project/controller/SimulationRunController.java +++ b/project/src/main/java/com/sdm/project/controller/SimulationRunController.java @@ -395,17 +395,4 @@ public class SimulationRunController implements ISimulationRunFeignClient { return runService.syncKeyResultToTask(req); } - /** - * 根据流程实例ID完成算列(将状态更新为完成) - * 由Flowable流程结束监听器调用 - * - * @param flowInstanceId 流程实例ID - * @return SdmResponse - */ - @SysLog("根据流程实例ID完成算列") - @PostMapping("/completeRunByFlowInstanceId") - @Override - public SdmResponse completeRunByFlowInstanceId(@RequestParam("flowInstanceId") String flowInstanceId) { - return runService.completeRunByFlowInstanceId(flowInstanceId); - } } \ No newline at end of file diff --git a/project/src/main/java/com/sdm/project/service/ISimulationRunService.java b/project/src/main/java/com/sdm/project/service/ISimulationRunService.java index efa79322..7b09631d 100644 --- a/project/src/main/java/com/sdm/project/service/ISimulationRunService.java +++ b/project/src/main/java/com/sdm/project/service/ISimulationRunService.java @@ -110,13 +110,4 @@ public interface ISimulationRunService extends IService { SdmResponse syncKeyResultToTask(KeyResultReq req); - /** - * 根据流程实例ID完成算列(将状态更新为完成) - * 由Flowable流程结束监听器调用 - * - * @param flowInstanceId 流程实例ID - * @return SdmResponse - */ - SdmResponse completeRunByFlowInstanceId(String flowInstanceId); - } \ No newline at end of file diff --git a/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java index 53029f9f..829d5deb 100644 --- a/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java @@ -2309,44 +2309,4 @@ public class SimulationRunServiceImpl extends ServiceImpl