REQ-3540: 归一配置
This commit is contained in:
parent
959966244a
commit
638115af83
@ -76,7 +76,7 @@ public class FileDatabaseService {
|
||||
public void addActivatedWorkspace(FileDatabaseAddWorkspaceRequest request) {
|
||||
request.checkExpiredDate();
|
||||
docLogDao.logRequest("addActivatedWorkspace", request.getWorkspaceId(), request);
|
||||
IndexNode templateRoot = checkTemplateDatabase(request.getTemplateDatabaseCode());
|
||||
IndexNode templateRoot = checkTemplateDatabaseNode(request.getTemplateDatabaseCode());
|
||||
FileDatabase db = transaction.execute(unused -> addWorkspace0(request));
|
||||
Future<?> future = asyncCopySubtree(db, templateRoot, null);
|
||||
asyncUtils.getOrTimeout(future, "添加等待超时, 添加任务在后台运行, 请稍后刷新查看");
|
||||
@ -113,7 +113,7 @@ public class FileDatabaseService {
|
||||
FileDatabase db = fileDatabaseDao.getOrThrow(request.getCode());
|
||||
if (db.isActivated())
|
||||
return;
|
||||
IndexNode templateRoot = checkTemplateDatabase(db.getTemplateDatabaseCode());
|
||||
IndexNode templateRoot = checkTemplateDatabaseNode(db.getTemplateDatabaseCode());
|
||||
Future<?> future = asyncCopySubtree(db, templateRoot, () -> updateCapacity(request).update());
|
||||
asyncUtils.getOrTimeout(future, "激活等待超时, 激活任务在后台运行, 请稍后刷新查看");
|
||||
}
|
||||
@ -134,7 +134,7 @@ public class FileDatabaseService {
|
||||
});
|
||||
}
|
||||
|
||||
private IndexNode checkTemplateDatabase(String templateDatabaseCode) {
|
||||
private IndexNode checkTemplateDatabaseNode(String templateDatabaseCode) {
|
||||
IndexNode indexNode = indexManager.getOrThrow(templateDatabaseCode);
|
||||
BizAssertions.assertTrue(indexNode.isDatabase(), "只能选择资料库作为模板");
|
||||
return indexNode;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user