Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Bug-8645][Api] Resource Re Upload, name duplicate #8811

Merged
merged 8 commits into from
Mar 10, 2022
Merged

[Bug-8645][Api] Resource Re Upload, name duplicate #8811

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5abdd45
Merge remote-tracking branch 'upstream/dev' into dev
Dec 15, 2021
b0c5275
Merge remote-tracking branch 'upstream/dev' into dev
Dec 21, 2021
007312a
Merge remote-tracking branch 'upstream/dev' into dev
zhanqian-1993 Dec 27, 2021
a8e737b
Merge remote-tracking branch 'upstream/dev' into HEAD
zhanqian-1993 Jan 10, 2022
c8c7cb8
Merge branch 'latest' into dev
zhanqian-1993 Jan 10, 2022
7aeecaf
Merge remote-tracking branch 'upstream/dev' into dev
zhanqian-1993 Mar 3, 2022
4ceb352
Merge remote-tracking branch 'upstream/dev' into dev
zhanqian-1993 Mar 10, 2022
ba50cb1
issue 8645
zhanqian-1993 Mar 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions .../main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1108,16 +1108,20 @@ private boolean checkAndImport(User loginUser, long projectCode, Map<String, Obj
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<String, Object> checkResult = verifyProcessDefinitionName(loginUser, projectCode, processDefinition.getName());
Map<String, Object> 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());
Expand Down