档案并卷

blade-service/blade-archive/src/main/java/org/springblade/archive/controller/ArchivesAutoController.java

@@ -681,15 +681,8 @@ public class ArchivesAutoController extends BladeController {
 			archivesAutoService.reCreateArchiveAuto(auto, archiveFileList);
 			return R.status(true);
 		}else {
-			for (Long id : Func.toLongList(ids)) {
-				//先查出勾选的案卷
-				ArchivesAuto archivesAuto=archivesAutoService.getById(id);
-				//查出所有案卷文件
-				List<ArchiveFile>archiveFileList=archiveFileClient.getArchiveFileByArchiveIds(id+"");
-				//设置案卷页码和四要素
-				archivesAutoService.reCreateArchiveAuto(archivesAuto, archiveFileList);
-			}
-			return R.status(true);
+			archivesAutoService.reCreateArchiveAuto1(ids);
+			return R.success("正在重组，请稍后查看");
 		}
 	}
 

blade-service/blade-archive/src/main/java/org/springblade/archive/service/IArchivesAutoService.java

@@ -177,4 +177,6 @@ public interface IArchivesAutoService extends BaseService<ArchivesAuto> {
 	List<Long> getArchiveIdsByNodes(List<Long> ids);
 
 	void reomoveArchiveAndFile(List<Long> archiveIds);
+
+    void reCreateArchiveAuto1(String ids);
 }

blade-service/blade-archive/src/main/java/org/springblade/archive/service/impl/ArchivesAutoServiceImpl.java

@@ -5001,6 +5001,19 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 		autoMapper.removeFilesByArchiveIds(archiveIds);
 	}
 
+	@Override
+	@Async
+	public void reCreateArchiveAuto1(String ids) {
+		for (Long id : Func.toLongList(ids)) {
+			//先查出勾选的案卷
+			ArchivesAuto archivesAuto=this.getById(id);
+			//查出所有案卷文件
+			List<ArchiveFile>archiveFileList=archiveFileClient.getArchiveFileByArchiveIds(id+"");
+			//设置案卷页码和四要素
+			this.reCreateArchiveAuto(archivesAuto, archiveFileList);
+		}
+	}
+
 	/**
 	 * 分组适配方法：按nodeId分组文件并进行页数合并处理
 	 *