diff --git a/src/main/java/com/ai/da/python/PythonService.java b/src/main/java/com/ai/da/python/PythonService.java index 6e798983..2cebcf2d 100644 --- a/src/main/java/com/ai/da/python/PythonService.java +++ b/src/main/java/com/ai/da/python/PythonService.java @@ -1704,7 +1704,6 @@ public class PythonService { List designSingleItemList = designSingleIncludeLayersDTO.getDesignSingleItemDTOList(); List response = new ArrayList<>(); - designSingleItemList.forEach(designSingleItem -> { response.add(new DesignPythonItem( designSingleItem.getType(), diff --git a/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java b/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java index 07640321..8cd0c49f 100644 --- a/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java @@ -451,7 +451,7 @@ public class DesignItemServiceImpl extends ServiceImpl { DesignItemClothesDetailVO designItemClothesDetailVO = new DesignItemClothesDetailVO(); designItemClothesDetailVO.setId(singleItem.getId()); designItemClothesDetailVO.setType(singleItem.getType()); - designItemClothesDetailVO.setPath(minioUtil.splitThenGetPreviewUrl(singleItem.getPath(),480)); + designItemClothesDetailVO.setPath(minioUtil.getPresignedUrl(singleItem.getPath(),24 * 60)); designItemClothesDetailVO.setMinIOPath(singleItem.getPath()); designItemClothesDetailVO.setColor(panToneService.getPantoneByRgb(singleItem.getColor())); // designItemClothesDetailVO.setPrintObject(new DesignPythonItemPrint(singleItem.getPrintObject().getPath())); diff --git a/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java b/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java index 6a040df6..635ca07e 100644 --- a/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java @@ -846,7 +846,7 @@ public class DesignServiceImpl extends ServiceImpl impleme .collect(Collectors.toList()); response.setClothes(CopyUtil.copyList(filterDetail,DesignItemClothesDetailVO.class,(o,d)->{ d.setId(o.getId()); - d.setPath(minIoUtil.splitThenGetPreviewUrl(o.getPath(),480)); + d.setPath(minIoUtil.getPresignedUrl(o.getPath(),24 * 60)); d.setMinIOPath(o.getPath()); d.setLevel1Type(converTypeToLevel1(o.getType())); // 根据designItemDetailId获取印花 @@ -871,12 +871,12 @@ public class DesignServiceImpl extends ServiceImpl impleme .collect(Collectors.toList()); response.setOthers(CopyUtil.copyList(filterDetail2, DesignItemOthersDetailVO.class, (o, d) -> { d.setId(o.getBusinessId()); - d.setPath(minIoUtil.splitThenGetPreviewUrl(o.getPath(),480)); + d.setPath(minIoUtil.getPresignedUrl(o.getPath(),24 * 60)); d.setMinIOPath(o.getPath()); d.setPrintObject(new DesignPythonItemPrint()); })); return editDesignItemLayer(flag,designPythonOutfit, - minIoUtil.splitThenGetPreviewUrl(designPythonOutfit.getDesignUrl(),480), + minIoUtil.getPresignedUrl(designPythonOutfit.getDesignUrl(),24 * 60), editResponseColor(designItemDetails,response)); } @@ -1014,7 +1014,7 @@ public class DesignServiceImpl extends ServiceImpl impleme }); // 2、将查询出的图层信息填充到designItemDetailVO中 - designItemDetailVO.setDesignItemUrl(minIoUtil.splitThenGetPreviewUrl(designPythonOutfit.getDesignUrl(),480)); + designItemDetailVO.setDesignItemUrl(minIoUtil.getPresignedUrl(designPythonOutfit.getDesignUrl(),24 * 60)); // 2.1 填充clothes designItemDetailVO.getClothes().forEach(c -> { String type = c.getType().toLowerCase(); @@ -1057,7 +1057,7 @@ public class DesignServiceImpl extends ServiceImpl impleme designSinglePrint.setAngle(detailPrint.getAngle()); designSinglePrint.setPriority(detailPrint.getPriority()); } - designSinglePrint.setPath(minIoUtil.splitThenGetPreviewUrl(detailPrint.getPath(),480)); + designSinglePrint.setPath(minIoUtil.getPresignedUrl(detailPrint.getPath(),24 * 60)); designSinglePrint.setMinIOPath(detailPrint.getPath()); designSinglePrint.setScale(detailPrint.getScale()); prints.add(designSinglePrint); @@ -1067,7 +1067,7 @@ public class DesignServiceImpl extends ServiceImpl impleme designItemDetailPrints.forEach(print -> { if (print.getSingleOrOverall().equals("single")){ prints.add(new DesignSinglePrint( - minIoUtil.splitThenGetPreviewUrl(print.getPath(),480), + minIoUtil.getPresignedUrl(print.getPath(),24 * 60), print.getPath(), JSONArray.parseArray(print.getPosition(),Double.class), print.getScale(), diff --git a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java index f6c529aa..6190352b 100644 --- a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java @@ -110,7 +110,7 @@ public class GenerateServiceImpl extends ServiceImpl im GenerateCollectionItemVO generateCollectionItemVO = new GenerateCollectionItemVO(); generateCollectionItemVO.setGenerateItemId(generateDetail.getId()); - generateCollectionItemVO.setGenerateItemUrl(minioUtil.splitThenGetPreviewUrl(item,480)); + generateCollectionItemVO.setGenerateItemUrl(minioUtil.getPresignedUrl(item,24 * 60)); generatedCollectionItems.add(generateCollectionItemVO); }); diff --git a/src/main/java/com/ai/da/service/impl/TDesignPythonOutfitDetailServiceImpl.java b/src/main/java/com/ai/da/service/impl/TDesignPythonOutfitDetailServiceImpl.java index f451af03..7f3aa0dc 100644 --- a/src/main/java/com/ai/da/service/impl/TDesignPythonOutfitDetailServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/TDesignPythonOutfitDetailServiceImpl.java @@ -54,9 +54,9 @@ public class TDesignPythonOutfitDetailServiceImpl extends ServiceImpl) JSON.parse(detail.getPosition())); designPythonOutfitVO.setImageSize(StringUtil.isNullOrEmpty(detail.getImageSize()) ? null : (List) JSON.parse(detail.getImageSize())); - designPythonOutfitVO.setImageUrl(StringUtil.isNullOrEmpty(detail.getImageUrl()) ? null : minIoUtil.splitThenGetPreviewUrl(detail.getImageUrl(),480)); + designPythonOutfitVO.setImageUrl(StringUtil.isNullOrEmpty(detail.getImageUrl()) ? null : minIoUtil.getPresignedUrl(detail.getImageUrl(),24 * 60)); designPythonOutfitVO.setImageMinioUrl(StringUtil.isNullOrEmpty(detail.getImageUrl()) ? null : detail.getImageUrl()); - designPythonOutfitVO.setMaskUrl(StringUtil.isNullOrEmpty(detail.getMaskUrl()) ? null : minIoUtil.splitThenGetPreviewUrl(detail.getMaskUrl(),480)); + designPythonOutfitVO.setMaskUrl(StringUtil.isNullOrEmpty(detail.getMaskUrl()) ? null : minIoUtil.getPresignedUrl(detail.getMaskUrl(),24 * 60)); designPythonOutfitVO.setMaskMinioUrl(StringUtil.isNullOrEmpty(detail.getMaskUrl()) ? null : detail.getMaskUrl()); designPythonOutfitVO.setScale(Float.parseFloat(detail.getScale())); designPythonOutfitVO.setOffset(CollectionUtil.isEmpty(offset) ? Arrays.asList(0L,0L) : offset);