diff --git a/common/src/main/java/com/sdm/common/entity/req/data/GetFileBaseInfoReq.java b/common/src/main/java/com/sdm/common/entity/req/data/GetFileBaseInfoReq.java index 934cb9c4..0fcba1aa 100644 --- a/common/src/main/java/com/sdm/common/entity/req/data/GetFileBaseInfoReq.java +++ b/common/src/main/java/com/sdm/common/entity/req/data/GetFileBaseInfoReq.java @@ -14,4 +14,8 @@ public class GetFileBaseInfoReq { @Schema(description = "节点UUID") private String uuid; + + @Schema(description = "是否查询tag或者文件标签信息,默认都查") + private boolean getSlaveInfo = true; + } \ No newline at end of file diff --git a/data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java b/data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java index 4aa8d46b..5452cb2d 100644 --- a/data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java +++ b/data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java @@ -1062,13 +1062,15 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService { fileMetadataInfoResp.setApprovalStatus("approved"); } } + // 查询附属信息的,默认是true去查询,hpc工作流不用查 + if(req.isGetSlaveInfo()){ + log.info("getFileBaseInfo start:{}",JSONObject.toJSONString(req)); + // 填充文件ta1-tag10的信息 + hierarchyHelper.setTagReqFromFileMetadata(fileMetadataInfo,fileMetadataInfoResp); - // 填充文件ta1-tag10的信息 - hierarchyHelper.setTagReqFromFileMetadata(fileMetadataInfo,fileMetadataInfoResp); - - // 填充文件类型标签信息 - fileDictTagQueryService.fillFileTagsForRespList(List.of(fileMetadataInfoResp), FileMetadataInfoResp::getId); - + // 填充文件类型标签信息 + fileDictTagQueryService.fillFileTagsForRespList(List.of(fileMetadataInfoResp), FileMetadataInfoResp::getId); + } return SdmResponse.success(fileMetadataInfoResp); } diff --git a/flowable/src/main/java/com/sdm/flowable/delegate/handler/HpcHandler.java b/flowable/src/main/java/com/sdm/flowable/delegate/handler/HpcHandler.java index b822a8df..fa8ca343 100644 --- a/flowable/src/main/java/com/sdm/flowable/delegate/handler/HpcHandler.java +++ b/flowable/src/main/java/com/sdm/flowable/delegate/handler/HpcHandler.java @@ -265,6 +265,8 @@ public class HpcHandler implements ExecutionHandler,HPCExecu // 查data表 GetFileBaseInfoReq getFileBaseInfoReq = new GetFileBaseInfoReq(); getFileBaseInfoReq.setFileId(outputDirId); + // 不需要查询文件的标签信息 + getFileBaseInfoReq.setGetSlaveInfo(false); SdmResponse fileBaseInfoResp = dataFeignClient.getFileBaseInfo(getFileBaseInfoReq); if(!fileBaseInfoResp.isSuccess()||fileBaseInfoResp.getData()==null){ CoreLogger.warn("getFileBaseInfo failed,outputDirId:{}",outputDirId);