From e466f54c5dd16833fc9407220cb5d3bea455f0c8 Mon Sep 17 00:00:00 2001 From: zhanqian <360400325@qq.com> Date: Thu, 10 Mar 2022 20:01:44 +0800 Subject: [PATCH] issue 8645 (#8811) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: 北笙 <“zhanqian@cai-inc.com”> Co-authored-by: zhanqian --- .../api/service/impl/ProcessDefinitionServiceImpl.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java index 947c6df268..9f1b343814 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java @@ -1108,16 +1108,20 @@ public class ProcessDefinitionServiceImpl extends BaseServiceImpl implements Pro return false; } ProcessDefinition processDefinition = dagDataSchedule.getProcessDefinition(); + + // generate import processDefinitionName + String processDefinitionName = recursionProcessDefinitionName(projectCode, processDefinition.getName(), 1); + String importProcessDefinitionName = processDefinitionName + "_import_" + DateUtils.getCurrentTimeStamp(); + //unique check - Map checkResult = verifyProcessDefinitionName(loginUser, projectCode, processDefinition.getName()); + Map checkResult = verifyProcessDefinitionName(loginUser, projectCode, importProcessDefinitionName); if (Status.SUCCESS.equals(checkResult.get(Constants.STATUS))) { putMsg(result, Status.SUCCESS); } else { result.putAll(checkResult); return false; } - String processDefinitionName = recursionProcessDefinitionName(projectCode, processDefinition.getName(), 1); - processDefinition.setName(processDefinitionName + "_import_" + DateUtils.getCurrentTimeStamp()); + processDefinition.setName(importProcessDefinitionName); processDefinition.setId(0); processDefinition.setProjectCode(projectCode); processDefinition.setUserId(loginUser.getId());