From 59469b5e92de6fb34937245c460e5836b8f8214a Mon Sep 17 00:00:00 2001 From: yiminpeng Date: Wed, 7 May 2025 18:11:21 +0800 Subject: [PATCH 1/2] fix --- .../task/MultipleDatabaseChangeRuntimeFlowableTask.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/server/odc-service/src/main/java/com/oceanbase/odc/service/flow/task/MultipleDatabaseChangeRuntimeFlowableTask.java b/server/odc-service/src/main/java/com/oceanbase/odc/service/flow/task/MultipleDatabaseChangeRuntimeFlowableTask.java index 5b5d892ba0..d7d1210e26 100644 --- a/server/odc-service/src/main/java/com/oceanbase/odc/service/flow/task/MultipleDatabaseChangeRuntimeFlowableTask.java +++ b/server/odc-service/src/main/java/com/oceanbase/odc/service/flow/task/MultipleDatabaseChangeRuntimeFlowableTask.java @@ -30,6 +30,7 @@ import com.oceanbase.odc.common.i18n.I18n; import com.oceanbase.odc.common.json.JsonUtils; +import com.oceanbase.odc.common.util.StringUtils; import com.oceanbase.odc.core.shared.constant.FlowStatus; import com.oceanbase.odc.core.shared.constant.TaskErrorStrategy; import com.oceanbase.odc.core.shared.constant.TaskType; @@ -149,8 +150,10 @@ protected Void start(Long taskId, TaskService taskService, DelegateExecution exe createFlowInstanceReq.setParentFlowInstanceId(FlowTaskUtil.getFlowInstanceId(execution)); createFlowInstanceReq.setParameters(multipleDatabaseChangeParameters .convertIntoDatabaseChangeParameters(multipleDatabaseChangeParameters)); - createFlowInstanceReq.setDescription( - generateDescription(locale, map.get(batchDatabaseId), getFlowInstanceId(), this.batchId)); + String description = StringUtils.isEmpty(detail.getDescription()) + ? generateDescription(locale, map.get(batchDatabaseId), getFlowInstanceId(), this.batchId) + : detail.getDescription(); + createFlowInstanceReq.setDescription(description); List individualFlowInstance = flowInstanceService.createWithoutApprovalNode( createFlowInstanceReq); flowInstanceIds.add(individualFlowInstance.get(0).getId()); From d359fbaaa1cc32dfe6a538912d14364ececd1079 Mon Sep 17 00:00:00 2001 From: yiminpeng Date: Thu, 8 May 2025 10:42:43 +0800 Subject: [PATCH 2/2] optimize --- .../flow/task/MultipleDatabaseChangeRuntimeFlowableTask.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/odc-service/src/main/java/com/oceanbase/odc/service/flow/task/MultipleDatabaseChangeRuntimeFlowableTask.java b/server/odc-service/src/main/java/com/oceanbase/odc/service/flow/task/MultipleDatabaseChangeRuntimeFlowableTask.java index d7d1210e26..c924b0f871 100644 --- a/server/odc-service/src/main/java/com/oceanbase/odc/service/flow/task/MultipleDatabaseChangeRuntimeFlowableTask.java +++ b/server/odc-service/src/main/java/com/oceanbase/odc/service/flow/task/MultipleDatabaseChangeRuntimeFlowableTask.java @@ -142,6 +142,7 @@ protected Void start(Long taskId, TaskService taskService, DelegateExecution exe Map map = multipleDatabaseChangeParameters.getDatabases().stream() .collect(Collectors.toMap(DatabaseChangeDatabase::getId, Function.identity())); Locale locale = multipleDatabaseChangeParameters.getLocale(); + boolean descriptionIsEmpty = StringUtils.isEmpty(detail.getDescription()); for (Long batchDatabaseId : batchDatabaseIds) { CreateFlowInstanceReq createFlowInstanceReq = new CreateFlowInstanceReq(); createFlowInstanceReq.setDatabaseId(batchDatabaseId); @@ -150,7 +151,7 @@ protected Void start(Long taskId, TaskService taskService, DelegateExecution exe createFlowInstanceReq.setParentFlowInstanceId(FlowTaskUtil.getFlowInstanceId(execution)); createFlowInstanceReq.setParameters(multipleDatabaseChangeParameters .convertIntoDatabaseChangeParameters(multipleDatabaseChangeParameters)); - String description = StringUtils.isEmpty(detail.getDescription()) + String description = descriptionIsEmpty ? generateDescription(locale, map.get(batchDatabaseId), getFlowInstanceId(), this.batchId) : detail.getDescription(); createFlowInstanceReq.setDescription(description);