|
@@ -1500,11 +1500,11 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
|
|
private void createArchive2(List<ArchiveFile> waitArchiveFiles, Long archiveAutoGroupId, Long projectId,IArchiveNameService.NodeHierarchy nameInfo) {
|
|
private void createArchive2(List<ArchiveFile> waitArchiveFiles, Long archiveAutoGroupId, Long projectId,IArchiveNameService.NodeHierarchy nameInfo) {
|
|
|
|
|
|
//获取同一分类archiveAutoGroupId下设置的(设置规则时选中的)节点,排好序
|
|
//获取同一分类archiveAutoGroupId下设置的(设置规则时选中的)节点,排好序
|
|
- List<ArchiveTreeContract> selectList = archiveTreeContractClient.getStorageNodeByGroupId(projectId, archiveAutoGroupId);
|
|
|
|
- //分类并卷节点默认采用同类型下第一个存储节点为归属节点
|
|
|
|
- if (selectList== null || selectList.size() == 0) {
|
|
|
|
- return;
|
|
|
|
- }
|
|
|
|
|
|
+// List<ArchiveTreeContract> selectList = archiveTreeContractClient.getStorageNodeByGroupId(projectId, archiveAutoGroupId);
|
|
|
|
+// //分类并卷节点默认采用同类型下第一个存储节点为归属节点
|
|
|
|
+// if (selectList== null || selectList.size() == 0) {
|
|
|
|
+// return;
|
|
|
|
+// }
|
|
|
|
|
|
if (waitArchiveFiles==null || waitArchiveFiles.size()== 0) {
|
|
if (waitArchiveFiles==null || waitArchiveFiles.size()== 0) {
|
|
return;
|
|
return;
|
|
@@ -1512,7 +1512,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
|
|
|
|
|
|
String strfirstNodeId = waitArchiveFiles.get(0).getNodeId();
|
|
String strfirstNodeId = waitArchiveFiles.get(0).getNodeId();
|
|
|
|
|
|
- ArchiveTreeContract node = selectList.get(0);
|
|
|
|
|
|
+ ArchiveTreeContract node = null;
|
|
if (StringUtils.isNotEmpty(strfirstNodeId)) {
|
|
if (StringUtils.isNotEmpty(strfirstNodeId)) {
|
|
Long firstNodeId = Long.parseLong(strfirstNodeId);
|
|
Long firstNodeId = Long.parseLong(strfirstNodeId);
|
|
ArchiveTreeContract firstNode = archiveTreeContractClient.getArchiveTreeContractById(firstNodeId);
|
|
ArchiveTreeContract firstNode = archiveTreeContractClient.getArchiveTreeContractById(firstNodeId);
|
|
@@ -2060,6 +2060,8 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
|
|
} else {
|
|
} else {
|
|
// 分类并卷流程
|
|
// 分类并卷流程
|
|
// 步骤7:将文件按照<groupId,List<文件>>放入集合
|
|
// 步骤7:将文件按照<groupId,List<文件>>放入集合
|
|
|
|
+ //改用top分组了
|
|
|
|
+ archiveAutoGroupId = curTopId;
|
|
if (archiveMap.containsKey(archiveAutoGroupId)) {
|
|
if (archiveMap.containsKey(archiveAutoGroupId)) {
|
|
List<ArchiveFile> groupList = archiveMap.get(archiveAutoGroupId);
|
|
List<ArchiveFile> groupList = archiveMap.get(archiveAutoGroupId);
|
|
groupList.add(file);
|
|
groupList.add(file);
|
|
@@ -3107,7 +3109,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
- public void test() {
|
|
|
|
|
|
+ public void test666() {
|
|
Long projectId = 0L;
|
|
Long projectId = 0L;
|
|
List<ArchiveTreeContract> archiveTreeContracts = archiveTreeContractClient.getListByProjectId(projectId);
|
|
List<ArchiveTreeContract> archiveTreeContracts = archiveTreeContractClient.getListByProjectId(projectId);
|
|
|
|
|