diff --git a/backend/src/main/java/com/qqchen/deploy/backend/workflow/constants/WorkFlowConstants.java b/backend/src/main/java/com/qqchen/deploy/backend/workflow/constants/WorkFlowConstants.java index ef862260..addf01c7 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/workflow/constants/WorkFlowConstants.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/workflow/constants/WorkFlowConstants.java @@ -2,10 +2,12 @@ package com.qqchen.deploy.backend.workflow.constants; public interface WorkFlowConstants { - public static final String WORKFLOW_EXEC_ERROR = "WORKFLOW_EXEC_ERROR"; + String WORKFLOW_EXEC_ERROR = "WORKFLOW_EXEC_ERROR"; - public static final String BOUNDARY_EVENT_ERROR_PREFIX = "BOUNDARY_EVENT_ERROR_"; - public static final String END_EVENT_ERROR_PREFIX = "END_EVENT_ERROR_"; - public static final String SEQUENCE_FLOW_ERROR_PREFIX = "SEQUENCE_FLOW_ERROR_"; + String BOUNDARY_EVENT_ERROR_PREFIX = "BOUNDARY_EVENT_ERROR_"; + + String END_EVENT_ERROR_PREFIX = "END_EVENT_ERROR_"; + + String SEQUENCE_FLOW_ERROR_PREFIX = "SEQUENCE_FLOW_ERROR_"; } diff --git a/backend/src/main/java/com/qqchen/deploy/backend/workflow/util/BpmnConverter.java b/backend/src/main/java/com/qqchen/deploy/backend/workflow/util/BpmnConverter.java index de817d8a..467a42be 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/workflow/util/BpmnConverter.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/workflow/util/BpmnConverter.java @@ -150,8 +150,8 @@ public class BpmnConverter { // 添加错误边界事件 BoundaryEvent boundaryEvent = new BoundaryEvent(); - boundaryEvent.setId("error_boundary_" + serviceTask.getId()); - boundaryEvent.setName("错误边界事件"); + boundaryEvent.setId(WorkFlowConstants.BOUNDARY_EVENT_ERROR_PREFIX + serviceTask.getId()); +// boundaryEvent.setName("错误边界事件"); boundaryEvent.setAttachedToRef(serviceTask); boundaryEvent.setAttachedToRefId(serviceTask.getId()); boundaryEvent.setCancelActivity(true); // 确保取消原有活动 @@ -163,8 +163,8 @@ public class BpmnConverter { // 添加错误结束事件 EndEvent errorEndEvent = new EndEvent(); - errorEndEvent.setId("error_end_" + serviceTask.getId()); - errorEndEvent.setName("错误结束事件"); + errorEndEvent.setId(WorkFlowConstants.END_EVENT_ERROR_PREFIX + serviceTask.getId()); +// errorEndEvent.setName("错误结束事件"); // 添加终止定义 TerminateEventDefinition terminateEventDefinition = new TerminateEventDefinition(); @@ -172,8 +172,8 @@ public class BpmnConverter { // 添加从边界事件到结束事件的连线 SequenceFlow errorFlow = new SequenceFlow(); - errorFlow.setId("error_flow_" + serviceTask.getId()); - errorFlow.setName("错误处理流程"); + errorFlow.setId(WorkFlowConstants.SEQUENCE_FLOW_ERROR_PREFIX + serviceTask.getId()); +// errorFlow.setName("错误处理流程"); errorFlow.setSourceRef(boundaryEvent.getId()); errorFlow.setTargetRef(errorEndEvent.getId());