Merge remote-tracking branch 'origin/master' into master

blade-service-api/blade-business-api/src/main/java/org/springblade/business/feign/InformationQueryClient.java

@@ -86,5 +86,8 @@ public interface InformationQueryClient {
     List<QueryProcessDataVO> getNodeChildTabColsAllByTabName(@RequestParam String initTabName);
 
     @PostMapping(API_PREFIX + "/getInformationByContractId")
-    List<InformationQuery> getInformationByContractId(Long contractId);
+    List<InformationQuery> getInformationByContractId(@RequestParam Long contractId);
+
+    @PostMapping(API_PREFIX + "/getInformationByContractId1")
+    void getInformationByContractId1(Long contractId);
 }

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/ArchiveTreeContractVO2.java

@@ -321,4 +321,16 @@ public class ArchiveTreeContractVO2 implements INodeEx<ArchiveTreeContractVO2> {
         this.flag = 1;
     }
 
+    public boolean IsQualityAssociationNode() {
+        if (this.getAssociationType() != null
+                && this.getAssociationType() == 1
+                && this.getDisplayHierarchy() != null
+                && (this.getStorageType()!= null && this.getStorageType() == 4)){
+            return true;
+        }
+        return  false;
+
+
+    }
+
 }

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

@@ -9,7 +9,9 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.*;
 import lombok.AllArgsConstructor;
 import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
+import org.springblade.archive.entity.ArchivesAuto;
 import org.springblade.archive.service.IArchivesAutoService;
 import org.springblade.archive.utils.FileUtils;
 import org.springblade.archive.vo.ArchivesAutoVO;
@@ -19,6 +21,7 @@ import org.springblade.business.vo.ArchiveFileVO;
 import org.springblade.common.utils.SnowFlakeUtil;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.oss.model.BladeFile;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
@@ -41,6 +44,7 @@ import java.util.stream.Collectors;
  * @author BladeX
  * @since 2022-07-08
  */
+@Slf4j
 @RestController
 @AllArgsConstructor
 @RequestMapping("/archiveFileAuto")
@@ -61,6 +65,9 @@ ArchiveFileAutoController extends BladeController {
     @ApiOperationSupport(order = 2)
     @ApiOperation(value = "批量新增")
     public R<Boolean> batchSave(@RequestBody ArchivesAutoVO archiveList) {
+
+        log.info("batchSave= uid " +
+                AuthUtil.getUserId() + " name " + AuthUtil.getNickName()  );
         try {
             for (ArchivesAutoVO archive : archiveList.getList()) {
                 if (archive.getId() == null) {
@@ -121,6 +128,10 @@ ArchiveFileAutoController extends BladeController {
                     }
                     archivesAutoService.save(archive);
                 } else {
+                    ArchivesAuto archivesAuto = archivesAutoService.getById(archive.getId());
+                    if (archivesAuto!= null ) {
+                        archive.setAutoFileSort(archivesAuto.getAutoFileSort());
+                    }
                     archivesAutoService.updateById(archive);
                 }
             }
@@ -139,6 +150,10 @@ ArchiveFileAutoController extends BladeController {
     @ApiOperationSupport(order = 2)
     @ApiOperation(value = "批量新增")
     public R<Boolean> batchSortSave(@RequestBody ArchivesAutoVO archiveList) {
+
+        log.info("batchSortSave= uid " +
+                AuthUtil.getUserId() + " name " + AuthUtil.getNickName()  );
+
         try {
             for (ArchivesAutoVO archive : archiveList.getList()) {
                 if (archive.getId() == null) {

blade-service/blade-archive/src/main/java/org/springblade/archive/utils/FileUtils.java

@@ -238,13 +238,15 @@ public class FileUtils {
                     }
 
                     //获取OSS文件输入流
-                    reader = new PdfReader(CommonUtil.getOSSInputStream(urlStr));
-
-                    pageCount = reader.getNumberOfPages();
-
-                    for (int i = 0; i < pageCount; ++i) {
-                        int is = i + 1;
-                        pdfCopy.addPage(pdfCopy.getImportedPage(reader, is));
+                    InputStream inputStream = CommonUtil.getOSSInputStream(urlStr);
+                    if (inputStream != null) {
+                        reader = new PdfReader(inputStream);
+                        pageCount = reader.getNumberOfPages();
+
+                        for (int i = 0; i < pageCount; ++i) {
+                            int is = i + 1;
+                            pdfCopy.addPage(pdfCopy.getImportedPage(reader, is));
+                        }
                     }
                 } catch (Exception e) {
                     e.printStackTrace();

blade-service/blade-business/src/main/java/org/springblade/business/feignClient/InformationQueryClientImpl.java

@@ -1,5 +1,6 @@
 package org.springblade.business.feignClient;
 
+import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -109,4 +110,11 @@ public class InformationQueryClientImpl implements InformationQueryClient {
     public List<InformationQuery> getInformationByContractId(Long contractId) {
         return informationQueryMapper.getInformationByContractId(contractId);
     }
+
+    @Override
+    public void getInformationByContractId1(Long contractId) {
+         System.out.println("1111");
+    }
+
+
 }

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TaskServiceImpl.java

@@ -1062,12 +1062,12 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
 
         List<String> listFiles = new ArrayList<>();
         listFiles.add(query.getEVisaPdfUrl());
-        Long fileSize = FileUtils.getOssFileSizeCount(listFiles);
+        //Long fileSize = FileUtils.getOssFileSizeCount(listFiles);
 
         if (archiveFile != null) {
             archiveFile.setEVisaFile(query.getEVisaPdfUrl());
             archiveFile.setPdfFileUrl(query.getEVisaPdfUrl()); // 这里将pdfFileUrl也更新了，因为需求中没有限制只能更新eVisaFile属性
-            archiveFile.setFileSize(fileSize);
+            archiveFile.setFileSize(query.getEVisaPdfSize());
             this.archiveFileService.updateById(archiveFile);
 
         } else {
@@ -1076,7 +1076,7 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
             if (wbsTreeContract!= null ) {
                 createTime = wbsTreeContract.getCreateTime();
             }
-            archiveFile = getArchiveFile(query,nodeId,keyId,fileSize,contractIndfo.archivesUnit(),createTime);
+            archiveFile = getArchiveFile(query,nodeId,keyId,query.getEVisaPdfSize(),contractIndfo.archivesUnit(),createTime);
             this.archiveFileService.save(archiveFile);
         }
     }

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

@@ -245,7 +245,7 @@ public class ArchiveTreeContractController extends BladeController {
             @ApiImplicitParam(name = "contractId", value = "合同段id", required = true)
     })
     public R<List<ArchiveTreeContractVO2>> lazyTree(Long parentId, Long projectId, Long contractId) {
-//		if (projectId == null) {
+//		if (projectId == null) {tree = {ArrayList@17448}  size = 1
 //			projectId = 1578599210897772545L;
 //		}
         List<ArchiveTreeContractVO2> tree = archiveTreeContractService.lazyTree2(AuthUtil.getTenantId(), parentId, projectId, contractId);
@@ -410,4 +410,22 @@ public class ArchiveTreeContractController extends BladeController {
         archiveTreeContractSync.syncBusinessDataThread(projectId,contractId);
         return R.success("开始同步合同段,请耐心等待" );
     }
+
+    @PostMapping("test1")
+    @ApiOperation(value = "同步业务数据", notes = "传入节点id")
+    public R test1(Long projectId,Long contractId) {
+
+        archiveTreeContractSync.syncBusinessData(projectId,contractId);
+
+        return R.success("开始同步合同段,请耐心等待" );
+    }
+
+    @PostMapping("testB")
+    @ApiOperation(value = "同步业务数据", notes = "传入节点id")
+    public R writeBusinessData(Long keyId, Long contractId, String formDataId) {
+
+        archiveTreeContractService.writeBusinessData(keyId,contractId,formDataId);
+
+        return R.success("开始同步合同段,请耐心等待" );
+    }
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/feign/WbsTreeContractClientImpl.java

@@ -409,7 +409,7 @@ public class WbsTreeContractClientImpl implements WbsTreeContractClient {
             String parentId = one.getParentId().toString();
             while (loop < max && StringUtils.isNotEquals(0, parentId)) {
                 WbsTreeContract next = this.wbsTreeContractService.getOne(Wrappers.<WbsTreeContract>lambdaQuery().eq(WbsTreeContract::getContractId, one.getContractId()).eq(WbsTreeContract::getId, parentId));
-                if(next.getNodeType().equals(nodeType)){
+                if(next.getNodeType() <= nodeType){
                     return next.getPKeyId();
                 }
                 parentId = next.getParentId().toString();

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

@@ -350,9 +350,7 @@ public class ArTreeContractInitServiceImpl {
 
         for (ArchiveTreeContractVO2 ar : archiveTreeContractVO2s) {
             //关联质检资料
-            if (ar.getAssociationType() != null
-                    && ar.getAssociationType() == 1
-                    && ar.getDisplayHierarchy() != null) {
+            if (ar.IsQualityAssociationNode()) {
                 List<ArchiveTreeContract> tmpList = getTreeContractFromWbs(tenantId, projectId, wbsId, ar);
                 addNodes.addAll(tmpList);
             }

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

@@ -256,6 +256,9 @@ public class ArchiveAutoRuleSyncImpl {
                     ArchiveTreeVO2 proTreeVO2 = proMap.get(fromId);
                     //2.获取项目级groupID
                     Long pro_groupId = proTreeVO2.getArchiveAutoGroupId();
+                    if (pro_groupId == null) {
+                        continue;
+                    }
                     //3.，那么保存到集合  合同段ID_项目级groupID,客户级groupID
                     Long contractId = contractVO2.getContractId();
                     if (contractId != null) {

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

@@ -539,6 +539,7 @@ public class ArchiveTreeContractSyncImpl {
     public List<InformationQuery>  getInformationQuerys(Long contractId) {
         //获取某个合同段所有的电签完成的文件题名，取 id wbsid name，eVisaPdfUrl
 //        List<InformationQuery> informationQueryList = new ArrayList<>();
+        informationQueryClient.getInformationByContractId1(contractId);
         List<InformationQuery> informationQueryList = informationQueryClient.getInformationByContractId(contractId);
         return informationQueryList;