11111

src/main/java/com/project/hyb/biz/service/impl/MbArtArtworksServiceImpl.java

@@ -113,9 +113,12 @@ public class MbArtArtworksServiceImpl extends ServiceImpl<MbArtArtworksMapper, M
             return null;
         }
 
-        //查询模型文件
-        Map<String, MbArtArtworksDto> mbArtArtworkMap = list.stream().collect(Collectors.toMap(v -> v.getArtworkUuid(), v->{
-            MbArtArtworksDto dto = BeanUtil.toBean(v, MbArtArtworksDto.class);
+        List<MbArtArtworksDto> dtoList = new ArrayList<>();
+        Map<String, MbArtArtworksDto> mbArtArtworkMap = new HashMap<>();
+        for (MbArtArtworks mbArtArtworks : list) {
+            MbArtArtworksDto dto = BeanUtil.toBean(mbArtArtworks, MbArtArtworksDto.class);
+            dtoList.add(dto);
+            mbArtArtworkMap.put(mbArtArtworks.getArtworkUuid(), dto);
             if(StrUtil.isNotEmpty(dto.getThumbnail())){
                 String name = FileUtil.getName(dto.getThumbnail());
                 String prefix = FileUtil.getPrefix(dto.getThumbnail()) + "_750_600";
@@ -123,8 +126,19 @@ public class MbArtArtworksServiceImpl extends ServiceImpl<MbArtArtworksMapper, M
                 dto.setThumbnail(dto.getThumbnail().replace(name, prefix + "." + extName));
             }
             dto.setDim(1);
-            return dto;
-        }));
+        }
+
+//        Map<String, MbArtArtworksDto> mbArtArtworkMap = list.stream().collect(Collectors.toMap(v -> v.getArtworkUuid(), v->{
+//            MbArtArtworksDto dto = BeanUtil.toBean(v, MbArtArtworksDto.class);
+//            if(StrUtil.isNotEmpty(dto.getThumbnail())){
+//                String name = FileUtil.getName(dto.getThumbnail());
+//                String prefix = FileUtil.getPrefix(dto.getThumbnail()) + "_750_600";
+//                String extName = FileUtil.extName(dto.getThumbnail());
+//                dto.setThumbnail(dto.getThumbnail().replace(name, prefix + "." + extName));
+//            }
+//            dto.setDim(1);
+//            return dto;
+//        }));
 
         List<ArtAttachmentFolderDto> artAttachmentFolderDtoList = artAttachmentFoldersService.list4dage(mbArtArtworkMap.keySet());
         if(CollUtil.isNotEmpty(artAttachmentFolderDtoList)){
@@ -137,11 +151,10 @@ public class MbArtArtworksServiceImpl extends ServiceImpl<MbArtArtworksMapper, M
             });
         }
 
-        List<MbArtArtworksDto> listAll = new ArrayList<>(mbArtArtworkMap.values());
         if(request.getDim() == 3){
-            return listAll;
+            return dtoList;
         }
 
-        return listAll.stream().filter(v->v.getDim().equals(request.getDim())).collect(Collectors.toList());
+        return dtoList.stream().filter(v->v.getDim().equals(request.getDim())).collect(Collectors.toList());
     }
 }