Merge branch '0705zhifk'

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

@@ -366,7 +366,10 @@ public class ArchiveFileController extends BladeController {
     @ApiOperation(value = "文件收集-上传文件责任者")
     public R getDutyUser(Long contractId, Long projectId) {
         ContractInfo contractById = null;
-        if (contractId == -1) {
+        if (contractId == null || contractId == -1) {
+            if(projectId == null || projectId == -1){
+                return R.data(null);
+            }
             List<Long> longs = new ArrayList<>();
             longs.add(projectId);
             List<ContractInfo> contractInfos = contractClient.queryContractListByIds(longs);

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

@@ -41,6 +41,8 @@ import org.springblade.archive.mapper.ArchivesAutoMapper;
 import org.springblade.archive.service.IArchivesAutoService;
 import org.springblade.business.entity.ArchiveFile;
 import org.springblade.business.feign.ArchiveFileClient;
+import org.springblade.business.feign.MetadataClassificationClient;
+import org.springblade.business.vo.ArchiveFileVO;
 import org.springblade.common.utils.CommonUtil;
 import org.springblade.common.utils.SnowFlakeUtil;
 import org.springblade.core.log.exception.ServiceException;
@@ -111,6 +113,8 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 
 	private final IArchiveProjectConfigService archiveProjectConfigService;
 
+	private final MetadataClassificationClient metadataClassificationClient;
+
 
 	@Override
 	public IPage<ArchivesAutoVO> selectArchivesAutoPage(IPage<ArchivesAutoVO> page, ArchivesAutoVO archivesAuto) {
@@ -1023,7 +1027,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 		String projectName = projectInfo.getProjectName();
 		String contractName="";
 		Long contractId = node.getContractId();
-		if(contractId!=null){
+		if(contractId!=null && contractId != -1){
 			ContractInfo contract = contractClient.getContractById(contractId);
 			contractName=contract.getContractName();
 		}
@@ -1101,6 +1105,13 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 
 		}
 		archiveFileClient.updateArchiveFileForCreateArchive(waitArchiveFiles);
+		try {
+			for (ArchiveFile saveVo : waitArchiveFiles) {
+				metadataClassificationClient.createMetadataFile(saveVo.getId(), 0);
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
 	}
 
 	/**
@@ -1148,6 +1159,13 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 			file.setIsArchive(1);
 		}
 		archiveFileClient.updateArchiveFileForCreateArchive(waitArchiveFiles);
+		try {
+			for (ArchiveFile saveVo : waitArchiveFiles) {
+				metadataClassificationClient.createMetadataFile(saveVo.getId(), 0);
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
 	}
 
 	/**
@@ -1189,6 +1207,13 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 			file.setIsArchive(1);
 		}
 		archiveFileClient.updateArchiveFileForCreateArchive(waitArchiveFiles);
+		try {
+			for (ArchiveFile saveVo : waitArchiveFiles) {
+				metadataClassificationClient.createMetadataFile(saveVo.getId(), 0);
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
 	}
 
 	private void createArchiveBox(String boxName,List<ArchiveFile> waitArchiveFiles){
@@ -1237,6 +1262,13 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 			file.setIsArchive(1);
 		}
 		archiveFileClient.updateArchiveFileForCreateArchive(waitArchiveFiles);
+		try {
+			for (ArchiveFile saveVo : waitArchiveFiles) {
+				metadataClassificationClient.createMetadataFile(saveVo.getId(), 0);
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
 	}