档案刷新

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

@@ -14,7 +14,7 @@ public interface IArchiveAutoPdfService {
     public void test1();
 
     //生成四要素,信息会写入archivesAuto
-    void buildArchiveFrontPdfs(Long projectId, ArchivesAuto archivesAuto, List<ArchiveFile> archiveFileList);
+    void buildArchiveFrontPdfs(Long projectId, ArchivesAuto archivesAuto, List<ArchiveFile> archiveFileList,boolean bBuildFront );
 
     //打码，信息写入waitArchiveFiles
     void builtFilePageNo(ArchivesAuto archivesAuto, List<ArchiveFile> waitArchiveFiles);
@@ -27,6 +27,8 @@ public interface IArchiveAutoPdfService {
 
     //只刷新档号
     boolean refreshFileNumber(ArchivesAuto archive, String fileNumber);
+    //强制刷新档号
+    boolean refreshFileNumberForce(ArchivesAuto archive,String fileNumber);
 
     //合并pdf
     String MergePdfAndUpload(List<String> urlList, String fileName, String filePath, Long projectId);

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

@@ -210,7 +210,7 @@ public class ArchiveAutoPdfServiceImpl implements IArchiveAutoPdfService {
         for (int i = 0; i < 20;i++) {
             archiveFiles.add(archiveFile);
         }
-        buildArchiveFrontPdfs(projectId,archivesAuto,archiveFiles);
+        buildArchiveFrontPdfs(projectId,archivesAuto,archiveFiles,true);
     }
 
 
@@ -220,7 +220,12 @@ public class ArchiveAutoPdfServiceImpl implements IArchiveAutoPdfService {
      * @param archivesAuto, 会更新起始时间和结束时间，所以调用后要更新
      * @param archiveFileList
      */
-    public void buildArchiveFrontPdfs(Long projectId, ArchivesAuto archivesAuto,List<ArchiveFile> archiveFileList) {
+    public void buildArchiveFrontPdfs(Long projectId, ArchivesAuto archivesAuto,List<ArchiveFile> archiveFileList,
+                                      boolean bBuildFront) {
+
+        if (bBuildFront == false) {
+            return;
+        }
         // 调用 getByProjectIdOrNew 方法获取 ArchiveProjectConfig 对象，并从中取得 factorType 的值
         ArchiveProjectConfig config = archiveProjectConfigService.getByProjectIdOrNew(projectId);
 
@@ -824,7 +829,24 @@ public class ArchiveAutoPdfServiceImpl implements IArchiveAutoPdfService {
 
         List<ArchiveFile> archiveFiles = archiveFileClient.getArchiveFileByArchiveID(archive.getId());
 
-        buildArchiveFrontPdfs(projectId,archive,archiveFiles);
+        buildArchiveFrontPdfs(projectId,archive,archiveFiles,true);
+
+        return true;
+    }
+
+    /**
+     * 刷新档号
+     * @param archive
+     * @param fileNumber
+     */
+    public boolean refreshFileNumberForce(ArchivesAuto archive,String fileNumber) {
+        //没变化则不用刷新，强制刷新
+        Long projectId = archive.getProjectId();
+        archive.setFileNumber(fileNumber);
+
+        List<ArchiveFile> archiveFiles = archiveFileClient.getArchiveFileByArchiveID(archive.getId());
+
+        buildArchiveFrontPdfs(projectId,archive,archiveFiles,true);
 
         return true;
     }

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

@@ -558,7 +558,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 			}
 			executorService.execute(()->{
 				log.info("[自动组卷-拆卷]{}","删除旧封面，页码文件开始"+removeFiles);
-				iossClient.removeFiles(removeFiles);
+				///iossClient.removeFiles(removeFiles);
 				log.info("[自动组卷-拆卷]{}","删除旧封面，页码文件结束"+removeFiles);
 			});
 
@@ -599,7 +599,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 
 				executorService.execute(()->{
 					log.info("[自动组卷-拆卷]{}","删除旧封面，页码文件开始"+removeFiles);
-					iossClient.removeFiles(removeFiles);
+					//iossClient.removeFiles(removeFiles);
 					log.info("[自动组卷-拆卷]{}","删除旧封面，页码文件结束"+removeFiles);
 				});
 
@@ -638,7 +638,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 
 				executorService.execute(()->{
 					log.info("[自动组卷-拆卷]{}","删除旧封面，页码文件开始"+removeFiles);
-					iossClient.removeFiles(removeFiles);
+					///iossClient.removeFiles(removeFiles);
 					log.info("[自动组卷-拆卷]{}","删除旧封面，页码文件结束"+removeFiles);
 				});
 
@@ -1108,7 +1108,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 		Long archivesAutoId = archivesAuto.getId();
 
 		//封面和生成文件页码
-		archiveAutoPdfService.buildArchiveFrontPdfs(archivesAuto.getProjectId(),archivesAuto,waitArchiveFiles);
+		archiveAutoPdfService.buildArchiveFrontPdfs(archivesAuto.getProjectId(),archivesAuto,waitArchiveFiles,false);
 
 		builtFilePageNo(archivesAuto,waitArchiveFiles);//生成文件页码
 
@@ -1163,7 +1163,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 		ArchivesAuto archivesAuto = builtArchives(node,pageN,fileN,startDate,endDate,archiveName);
 
 		//2.生成文件页码
-		archiveAutoPdfService.buildArchiveFrontPdfs(archivesAuto.getProjectId(),archivesAuto,waitArchiveFiles);
+		archiveAutoPdfService.buildArchiveFrontPdfs(archivesAuto.getProjectId(),archivesAuto,waitArchiveFiles,false);
 
 		builtFilePageNo(archivesAuto,waitArchiveFiles);
 
@@ -1211,7 +1211,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 		ArchivesAuto archivesAuto = builtArchives(node,pageN,fileN,startDate,endDate,archiveName);
 
 		//2.封面和生成文件页码
-		archiveAutoPdfService.buildArchiveFrontPdfs(archivesAuto.getProjectId(),archivesAuto,waitArchiveFiles);
+		archiveAutoPdfService.buildArchiveFrontPdfs(archivesAuto.getProjectId(),archivesAuto,waitArchiveFiles,false);
 
 		builtFilePageNo(archivesAuto,waitArchiveFiles);
 
@@ -1266,7 +1266,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 		ArchivesAuto archivesAuto = builtArchives(node,pageN,fileN,startDate,endDate,boxName);
 
 		//2.封面和生成文件页码
-		archiveAutoPdfService.buildArchiveFrontPdfs(archivesAuto.getProjectId(),archivesAuto,waitArchiveFiles);
+		archiveAutoPdfService.buildArchiveFrontPdfs(archivesAuto.getProjectId(),archivesAuto,waitArchiveFiles,false);
 
 		builtFilePageNo(archivesAuto,waitArchiveFiles);
 
@@ -1726,7 +1726,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 				}
 
 				String fileNumber = fileNumberPrefix +"_"+ index;
-				if (archiveAutoPdfService.refreshFileNumber(archivesAuto,fileNumber)){
+				if (archiveAutoPdfService.refreshFileNumberForce(archivesAuto,fileNumber)){
 					changeList.add(archivesAuto);
 				}
 				index++;
@@ -1927,7 +1927,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 			Long archivesAutoId = archivesAuto.getId();
 
 			//封面和生成文件页码
-			archiveAutoPdfService.buildArchiveFrontPdfs(archivesAuto.getProjectId(),archivesAuto,waitArchiveFiles);
+			archiveAutoPdfService.buildArchiveFrontPdfs(archivesAuto.getProjectId(),archivesAuto,waitArchiveFiles,true);
 
 			builtFilePageNo(archivesAuto,waitArchiveFiles);//生成文件页码