BUGFIX: 隐藏加载不出minio的相关数据;
This commit is contained in:
shahaibo
@@ -1408,6 +1408,7 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
|
||||
d.setMinIOPath(o.getPath());
|
||||
d.setPrintObject(new DesignPythonItemPrint());
|
||||
}));
|
||||
response.getOthers().removeIf(o -> !minioUtil.doesObjectExist(o.getMinIOPath()));
|
||||
return editDesignItemLayer(flag, designPythonOutfit,
|
||||
minioUtil.getPreSignedUrl(designPythonOutfit.getDesignUrl(), 24 * 60),
|
||||
editResponseColor(designItemDetails, response));
|
||||
|
||||
@@ -183,73 +183,93 @@ public class LibraryServiceImpl extends ServiceImpl<LibraryMapper, Library> impl
|
||||
}
|
||||
}
|
||||
queryWrapper.orderByDesc("id");
|
||||
IPage<Library> page = getBaseMapper().selectPage(
|
||||
new Page<>(query.getPage(), query.getSize()), queryWrapper);
|
||||
if (CollectionUtils.isEmpty(page.getRecords())) {
|
||||
// 1. 先查询所有符合条件的 Library 数据
|
||||
List<Library> libraryList = getBaseMapper().selectList(queryWrapper);
|
||||
if (CollectionUtils.isEmpty(libraryList)) {
|
||||
return PageBaseResponse.success(new Page<>());
|
||||
}
|
||||
|
||||
// 2. 封装打点内容
|
||||
Map<Long, LibraryModelPointVO> map = null;
|
||||
//封装打点内容
|
||||
Boolean isExist = page.getRecords().stream()
|
||||
boolean isExist = libraryList.stream()
|
||||
.anyMatch(library -> library.getLevel1Type().equals(LibraryLevel1TypeEnum.MODELS.getRealName()));
|
||||
if (isExist) {
|
||||
List<Long> libarayIds = page.getRecords().stream()
|
||||
List<Long> libraryIds = libraryList.stream()
|
||||
.filter(library -> library.getLevel1Type().equals(LibraryLevel1TypeEnum.MODELS.getRealName()))
|
||||
.map(Library::getId)
|
||||
.collect(Collectors.toList());
|
||||
List<LibraryModelPointVO> libraryModelPointVOS = libraryModelPointService.selectByLibraryIds(libarayIds);
|
||||
List<LibraryModelPointVO> libraryModelPointVOS = libraryModelPointService.selectByLibraryIds(libraryIds);
|
||||
if (!CollectionUtils.isEmpty(libraryModelPointVOS)) {
|
||||
map = libraryModelPointVOS.stream().collect(Collectors.toMap(LibraryModelPointVO::getRelationId, v -> v));
|
||||
map = libraryModelPointVOS.stream()
|
||||
.collect(Collectors.toMap(LibraryModelPointVO::getRelationId, v -> v));
|
||||
}
|
||||
}
|
||||
Map<Long, LibraryModelPointVO> finalMap = map;
|
||||
AtomicInteger i = new AtomicInteger();
|
||||
IPage<QueryLibraryPageVO> convert = page.convert((Function<Library, QueryLibraryPageVO>) library -> {
|
||||
QueryLibraryPageVO libraryPageVO = CopyUtil.copyObject(library, QueryLibraryPageVO.class);
|
||||
libraryPageVO.setDesignType(DesignTypeEnum.LIBRARY.getRealName());
|
||||
libraryPageVO.setMinIOPath(library.getUrl());
|
||||
String url = library.getUrl();
|
||||
if (minioUtil.doesObjectExist(url)) {
|
||||
libraryPageVO.setUrl(minioUtil.getPreSignedUrl(library.getUrl(), 24 * 60));
|
||||
if (finalMap != null && finalMap.containsKey(library.getId())) {
|
||||
libraryPageVO.setLibraryModelPoint(finalMap.get(library.getId()));
|
||||
}
|
||||
if (libraryPageVO.getLevel1Type().equals(LibraryLevel1TypeEnum.SKETCH_BOARD.getRealName())) {
|
||||
if (!StringUtils.isEmpty(libraryPageVO.getLevel2Type())) {
|
||||
Position position = Position.getPosition(libraryPageVO.getLevel2Type());
|
||||
libraryPageVO.setLevel2TypeEnum(new BizJson(position.getValue(), position.name(), BusinessException.getMessageFromResource(position.name())));
|
||||
}
|
||||
}
|
||||
if (libraryPageVO.getLevel1Type().equals(LibraryLevel1TypeEnum.PRINT_BOARD.getRealName())) {
|
||||
PrintboardLevel2TypeEnum printboardLevel2TypeEnum = PrintboardLevel2TypeEnum.fromName(libraryPageVO.getLevel2Type());
|
||||
libraryPageVO.setLevel2TypeEnum(new BizJson(printboardLevel2TypeEnum.getValue(), printboardLevel2TypeEnum.name(), BusinessException.getMessageFromResource(printboardLevel2TypeEnum.name())));
|
||||
}
|
||||
if (libraryPageVO.getLevel1Type().equals(LibraryLevel1TypeEnum.DESIGN_ELEMENTS.getRealName())) {
|
||||
DesignElementsEnum designElementsEnum = DesignElementsEnum.fromName(libraryPageVO.getLevel2Type());
|
||||
libraryPageVO.setLevel2TypeEnum(new BizJson(designElementsEnum.getValue(), designElementsEnum.name(), BusinessException.getMessageFromResource(designElementsEnum.name())));
|
||||
}
|
||||
return libraryPageVO;
|
||||
}else {
|
||||
i.getAndIncrement();
|
||||
return null;
|
||||
}
|
||||
}).getRecords().stream()
|
||||
.filter(Objects::nonNull)
|
||||
.collect(Collectors.collectingAndThen(
|
||||
Collectors.toList(),
|
||||
list -> new Page<QueryLibraryPageVO>(page.getCurrent(), page.getSize(), page.getTotal()) {
|
||||
@Override
|
||||
public List<QueryLibraryPageVO> getRecords() {
|
||||
return list;
|
||||
}
|
||||
|
||||
@Override
|
||||
public long getTotal() {
|
||||
return page.getTotal();
|
||||
// 3. 转换 Library 为 QueryLibraryPageVO，并通过 minioUtil 过滤掉不存在的 URL
|
||||
List<QueryLibraryPageVO> convertedList = libraryList.stream()
|
||||
.map(library -> {
|
||||
QueryLibraryPageVO libraryPageVO = CopyUtil.copyObject(library, QueryLibraryPageVO.class);
|
||||
libraryPageVO.setDesignType(DesignTypeEnum.LIBRARY.getRealName());
|
||||
libraryPageVO.setMinIOPath(library.getUrl());
|
||||
String url = library.getUrl();
|
||||
if (minioUtil.doesObjectExist(url)) {
|
||||
libraryPageVO.setUrl(minioUtil.getPreSignedUrl(url, 24 * 60));
|
||||
if (finalMap != null && finalMap.containsKey(library.getId())) {
|
||||
libraryPageVO.setLibraryModelPoint(finalMap.get(library.getId()));
|
||||
}
|
||||
if (libraryPageVO.getLevel1Type().equals(LibraryLevel1TypeEnum.SKETCH_BOARD.getRealName())) {
|
||||
if (!StringUtils.isEmpty(libraryPageVO.getLevel2Type())) {
|
||||
Position position = Position.getPosition(libraryPageVO.getLevel2Type());
|
||||
libraryPageVO.setLevel2TypeEnum(new BizJson(
|
||||
position.getValue(),
|
||||
position.name(),
|
||||
BusinessException.getMessageFromResource(position.name()))
|
||||
);
|
||||
}
|
||||
}
|
||||
));
|
||||
return PageBaseResponse.success(convert);
|
||||
if (libraryPageVO.getLevel1Type().equals(LibraryLevel1TypeEnum.PRINT_BOARD.getRealName())) {
|
||||
PrintboardLevel2TypeEnum printboardLevel2TypeEnum = PrintboardLevel2TypeEnum.fromName(libraryPageVO.getLevel2Type());
|
||||
libraryPageVO.setLevel2TypeEnum(new BizJson(
|
||||
printboardLevel2TypeEnum.getValue(),
|
||||
printboardLevel2TypeEnum.name(),
|
||||
BusinessException.getMessageFromResource(printboardLevel2TypeEnum.name()))
|
||||
);
|
||||
}
|
||||
if (libraryPageVO.getLevel1Type().equals(LibraryLevel1TypeEnum.DESIGN_ELEMENTS.getRealName())) {
|
||||
DesignElementsEnum designElementsEnum = DesignElementsEnum.fromName(libraryPageVO.getLevel2Type());
|
||||
libraryPageVO.setLevel2TypeEnum(new BizJson(
|
||||
designElementsEnum.getValue(),
|
||||
designElementsEnum.name(),
|
||||
BusinessException.getMessageFromResource(designElementsEnum.name()))
|
||||
);
|
||||
}
|
||||
return libraryPageVO;
|
||||
} else {
|
||||
// 如果对应的 MinIO 文件不存在，则返回 null，后续过滤掉
|
||||
return null;
|
||||
}
|
||||
})
|
||||
.filter(Objects::nonNull)
|
||||
.collect(Collectors.toList());
|
||||
|
||||
// 4. 手动分页
|
||||
int total = convertedList.size();
|
||||
int currentPage = query.getPage(); // 当前页码（从1开始）
|
||||
int pageSize = query.getSize(); // 每页大小
|
||||
int fromIndex = (currentPage - 1) * pageSize;
|
||||
int toIndex = Math.min(total, currentPage * pageSize);
|
||||
List<QueryLibraryPageVO> pageList = new ArrayList<>();
|
||||
if (fromIndex < total) {
|
||||
pageList = convertedList.subList(fromIndex, toIndex);
|
||||
}
|
||||
|
||||
// 5. 构造 IPage 对象（使用 MyBatis-Plus 的 Page 实现）
|
||||
IPage<QueryLibraryPageVO> pageResult = new Page<>(currentPage, pageSize, total);
|
||||
pageResult.setRecords(pageList);
|
||||
|
||||
// 6. 返回结果
|
||||
return PageBaseResponse.success(pageResult);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user