同步归档

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ArchiveTreeContractController.java

@@ -400,12 +400,12 @@ public class ArchiveTreeContractController extends BladeController {
     }
 
     @PostMapping("syncBusinessData")
-    @ApiOperation(value = "同步业务数据", notes = "传入节点id")
+    @ApiOperation(value = "同步合同段文件", notes = "传入节点id")
     public R syncBusinessData(Long projectId,Long contractId) {
         ContractInfo contract = contractInfoService.getById(contractId);
 
         Integer isArchivesAuto = contract.getIsArchivesAuto();
-        if(isArchivesAuto!=-1 && isArchivesAuto!=null && isArchivesAuto!=0){
+        if(isArchivesAuto!=null && isArchivesAuto!=0){
             return R.fail("当前合同段已经在同步中,请耐心等待");
         }
         log.info("开始自动组卷...." + contractId);
@@ -413,7 +413,7 @@ public class ArchiveTreeContractController extends BladeController {
         contractInfoService.updateIsArchivesAutoById(contractId,1);
 
         archiveTreeContractSync.syncBusinessDataThread(projectId,contractId);
-        return R.success("开始同步合同段,请耐心等待" );
+        return R.success("同步合同段文件完成" );
     }
 
     @PostMapping("test1")

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ArchiveTreeContractSyncImpl.java

@@ -254,7 +254,7 @@ public class ArchiveTreeContractSyncImpl {
      */
     public void  syncBusinessDataThread(Long projectId,Long contractId) {
 
-        executorService.execute(()->{
+        //executorService.execute(()->{
             try{
                 //将项目未锁定案卷拆卷
                 syncBusinessData(projectId,contractId);
@@ -267,7 +267,7 @@ public class ArchiveTreeContractSyncImpl {
                 //设置自动组卷结束
                 contractInfoService.updateIsArchivesAutoById(contractId, 0);
             }
-        });
+        //});
 
     }
 
@@ -279,6 +279,8 @@ public class ArchiveTreeContractSyncImpl {
      */
     public void  syncBusinessData(Long projectId,Long contractId) {
 
+        log.info("同步文件  projectId："+projectId+"-contractId:"+contractId);
+
         //项目信息
         ProjectInfo projectInfo = projectInfoService.getOne(projectId);
 
@@ -325,6 +327,10 @@ public class ArchiveTreeContractSyncImpl {
             wbsTreeKeyToIdMap.put(wbsTreeContractVO6.getPKeyId(),wbsTreeContractVO6.getId());
         }
 
+
+        log.info("同步文件  informationQueryList size ："+informationQueryList.size()+
+                " - archiveFiles :"+archiveFiles.size() +  " - wbsTreeContractVO6s :"+wbsTreeContractVO6s.size());
+
         //同步质检关联节点
         syncNodes(contractId, informationQueryList, wbsTreeContractVO6Map, wbsTreeKeyToSortMap,
                 wbsTreeKeyToIdMap, archiveKeyIdMap, contractIndfo);
@@ -421,10 +427,14 @@ public class ArchiveTreeContractSyncImpl {
             return;
         }
 
+        log.info("同步文件  syncNodes"+associatedNodes.size());
+
         Map<Long,Long> archiveTreeContractIdMap = new LinkedHashMap<>();
 
         for (ArchiveTreeContract node : associatedNodes) {
             Integer nodeLevel = Integer.valueOf(associatedNodes.get(0).getDisplayHierarchy());
+
+            log.info("同步文件  syncNode"+ nodeLevel + " " + node.getId() + " " +  node.getNodeName());
             if (nodeLevel == 0) {
                 continue;
             }