luok vor 2 Jahren
Ursprung
Commit
02d5d0c51f

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

@@ -340,30 +340,11 @@ public class ArchivesAutoController extends BladeController {
 			if(isArchivesAuto!=null && isArchivesAuto==1){
 				return R.fail("当前项目已经在自动组卷中,请耐心等待");
 			}
+			log.info("开始自动组卷....");
 			//设置自动组卷中
 			projectClient.updateIsArchivesAutoById(projectId,1);
 
-			executorService.execute(()->{
-				try{
-					//将项目未锁定案卷拆卷
-					log.info("[自动组卷]{}","开始对未锁定案卷拆卷。projectId:"+projectId+"-contractId:"+contractId+"-nodeId:"+nodeId);
-					archivesAutoService.splitArchvies(projectId,contractId,nodeId);
-					//项目自动组卷入口
-					log.info("[自动组卷]{}","开始自动组卷。projectId:"+projectId+"-contractId:"+contractId+"-nodeId:"+nodeId);
-					archivesAutoService.archiveAutoMethod(projectId,contractId,nodeId);
-					//刷新项目档号
-					log.info("[自动组卷]{}","开始刷新组卷档号。projectId:"+projectId+"-contractId:"+contractId+"-nodeId:"+nodeId);
-					archivesAutoService.refreshFileNumberNoSlipt(projectId,contractId,nodeId);
-					//设置自动组卷结束
-					projectClient.updateIsArchivesAutoById(projectId,0);
-					log.info("[自动组卷]{}","自动组卷完成。projectId:"+projectId+"-contractId:"+contractId+"-nodeId:"+nodeId);
-				}catch (Exception e){
-					e.printStackTrace();
-					log.error("自动组卷保错。"+e.getMessage()+"--projectId:"+projectId+"-contractId:"+contractId+"-nodeId:"+nodeId);
-					//设置自动组卷结束
-					projectClient.updateIsArchivesAutoById(projectId,0);
-				}
-			});
+			archivesAutoService.archiveAutoMethodThread(projectId,contractId,nodeId);
 			return R.data("自动组卷中,请耐心等待");
 		}catch (Exception e){
 			e.printStackTrace();

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

@@ -78,4 +78,7 @@ public interface IArchivesAutoService extends BaseService<ArchivesAuto> {
 	void test();
 
     List<DictBiz> getCarrierTypeByDict();
+
+	void archiveAutoMethodThread(Long projectId, Long contractId, Long nodeId);
+
 }

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

@@ -1643,5 +1643,30 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 		return autoMapper.getCarrierTypeByDict();
 	}
 
+	@Override
+	public void archiveAutoMethodThread(Long projectId, Long contractId, Long nodeId) {
+		executorService.execute(()->{
+			try{
+				//将项目未锁定案卷拆卷
+				log.info("[自动组卷]{}","开始对未锁定案卷拆卷。projectId:"+projectId+"-contractId:"+contractId+"-nodeId:"+nodeId);
+				splitArchvies(projectId,contractId,nodeId);
+				//项目自动组卷入口
+				log.info("[自动组卷]{}","开始自动组卷。projectId:"+projectId+"-contractId:"+contractId+"-nodeId:"+nodeId);
+				archiveAutoMethod(projectId,contractId,nodeId);
+				//刷新项目档号
+				log.info("[自动组卷]{}","开始刷新组卷档号。projectId:"+projectId+"-contractId:"+contractId+"-nodeId:"+nodeId);
+				refreshFileNumberNoSlipt(projectId,contractId,nodeId);
+				//设置自动组卷结束
+				projectClient.updateIsArchivesAutoById(projectId,0);
+				log.info("[自动组卷]{}","自动组卷完成。projectId:"+projectId+"-contractId:"+contractId+"-nodeId:"+nodeId);
+			}catch (Exception e){
+				e.printStackTrace();
+				log.error("自动组卷报错。"+e.getMessage()+"--projectId:"+projectId+"-contractId:"+contractId+"-nodeId:"+nodeId);
+				//设置自动组卷结束
+				projectClient.updateIsArchivesAutoById(projectId,0);
+			}
+		});
+	}
+
 
 }