From 0700ac1a7c1f73683008fdd3c5edda95407f7d80 Mon Sep 17 00:00:00 2001 From: yangyang Date: Fri, 27 Mar 2026 14:45:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9Adata=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E4=BF=A1=E6=81=AF=E6=9F=A5=E8=AF=A2=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0getSlaveInfo=E5=AD=97=E6=AE=B5=EF=BC=8C=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E5=8F=AF=E4=B8=8D=E6=9F=A5tag=E5=92=8C=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E4=BF=A1=E6=81=AF=EF=BC=8C=E9=BB=98=E8=AE=A4=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/entity/req/data/GetFileBaseInfoReq.java | 4 ++++ .../impl/MinioFileIDataFileServiceImpl.java | 14 ++++++++------ .../sdm/flowable/delegate/handler/HpcHandler.java | 2 ++ 3 files changed, 14 insertions(+), 6 deletions(-) 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);