fix:修复数据总览文件类型展示

This commit is contained in:
2026-03-11 17:52:13 +08:00
parent 395e9b4f1e
commit 485dbecce8
2 changed files with 10 additions and 1 deletions

View File

@@ -30,7 +30,7 @@ public enum FileDictTagEnum {
FILE_TYPE("ALL_FILE_TYPE", "fileTypeDictClass", "fileTypeDictValue", "fileTypeDictName"); FILE_TYPE("ALL_FILE_TYPE", "fileTypeDictClass", "fileTypeDictValue", "fileTypeDictName");
/** /**
* 字典分类(对应数据库中的 dictClass * 字典分类(对应数据库中的 dictClass,如 “ALL_FILE_TYPE”
*/ */
private final String dictClass; private final String dictClass;

View File

@@ -89,6 +89,9 @@ public class DimensionTemplateServiceImpl extends ServiceImpl<DimensionTemplateM
@Autowired @Autowired
private ISimulationTaskFeignClient simulationTaskFeignClient; private ISimulationTaskFeignClient simulationTaskFeignClient;
@Autowired
IFileDictTagQueryService fileDictTagQueryService;
@Autowired @Autowired
private TagMapService tagMapService; private TagMapService tagMapService;
@@ -381,12 +384,16 @@ public class DimensionTemplateServiceImpl extends ServiceImpl<DimensionTemplateM
// 创建包含children的DTO对象 // 创建包含children的DTO对象
FileMetadataChildrenDTO dto = FileMetadataConvert.INSTANCE.convertToFileMetadataChildrenDTO(baseInfo); FileMetadataChildrenDTO dto = FileMetadataConvert.INSTANCE.convertToFileMetadataChildrenDTO(baseInfo);
// 设置文件的节点信息tag1-tag10
hierarchyHelper.setTagReqFromFileMetadata(baseInfo, dto); hierarchyHelper.setTagReqFromFileMetadata(baseInfo, dto);
// 填充children的文件类型标签信息
fileDictTagQueryService.fillFileTagsForRespList(Collections.singletonList(dto), FileMetadataInfoResp::getId);
// 转换children列表并为每个child设置totalName // 转换children列表并为每个child设置totalName
List<FileMetadataInfoResp> children = new ArrayList<>(); List<FileMetadataInfoResp> children = new ArrayList<>();
for (FileMetadataInfo fileInfo : group) { for (FileMetadataInfo fileInfo : group) {
FileMetadataChildrenDTO childDto = FileMetadataConvert.INSTANCE.convertToFileMetadataChildrenDTO(fileInfo); FileMetadataChildrenDTO childDto = FileMetadataConvert.INSTANCE.convertToFileMetadataChildrenDTO(fileInfo);
// 设置文件的节点信息tag1-tag10
hierarchyHelper.setTagReqFromFileMetadata(fileInfo, childDto); hierarchyHelper.setTagReqFromFileMetadata(fileInfo, childDto);
// 设置totalName从bucketName中提取 // 设置totalName从bucketName中提取
String objectKey = fileInfo.getObjectKey(); String objectKey = fileInfo.getObjectKey();
@@ -409,6 +416,8 @@ public class DimensionTemplateServiceImpl extends ServiceImpl<DimensionTemplateM
childDto.setPermissionValue(fileUserPermissionService.getMergedPermission(fileInfo.getId(), ThreadLocalContext.getUserId())); childDto.setPermissionValue(fileUserPermissionService.getMergedPermission(fileInfo.getId(), ThreadLocalContext.getUserId()));
children.add(childDto); children.add(childDto);
} }
// 填充children的文件类型标签信息
fileDictTagQueryService.fillFileTagsForRespList(children, FileMetadataInfoResp::getId);
// 目前已经移除了学科节点学科信息作为task节点的字段附属信息 // 目前已经移除了学科节点学科信息作为task节点的字段附属信息
if(ObjectUtils.isNotEmpty(dto.getOwntaskId()) || if(ObjectUtils.isNotEmpty(dto.getOwntaskId()) ||