diff --git a/src/main/java/com/ai/da/common/constant/CommonConstant.java b/src/main/java/com/ai/da/common/constant/CommonConstant.java index 708bb2e5..b5dabb24 100644 --- a/src/main/java/com/ai/da/common/constant/CommonConstant.java +++ b/src/main/java/com/ai/da/common/constant/CommonConstant.java @@ -83,5 +83,7 @@ public class CommonConstant { public static final String PARTIAL_DESIGN_FILENAME = "PartialDesign"; + public static final String PARTIAL_DESIGN_PREVIEW_FILENAME = "Preview"; + } 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 bf2656ed..42797e5d 100644 --- a/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java @@ -509,15 +509,15 @@ public class DesignItemServiceImpl extends ServiceImpl { PartialDesignDTO partialDesignDTO = item.getPartialDesign(); if (!Objects.isNull(item.getPartialDesign()) && !StringUtil.isNullOrEmpty(item.getPartialDesign().getPartialDesignBase64())){ String path ; - if (!StringUtil.isNullOrEmpty(partialDesignDTO.getPartialDesignMinioPath())){ + if (!StringUtil.isNullOrEmpty(partialDesignDTO.getPartialDesignMinioPath()) && !preview){ String sourcePath = partialDesignDTO.getPartialDesignMinioPath(); path = sourcePath.substring(sourcePath.indexOf("/") + 1, sourcePath.lastIndexOf(".")); + }else if (preview){ + path = accountId + "/" + CommonConstant.PARTIAL_DESIGN_PREVIEW_FILENAME + "/" + UUID.randomUUID(); }else { path = accountId + "/" + CommonConstant.PARTIAL_DESIGN_FILENAME + "/" + UUID.randomUUID(); } - // todo 将原图地址作为修改后的图片地址,放在不同的桶 String newPath = minioUtil.base64UploadToPath(partialDesignDTO.getPartialDesignBase64(), partialDesignBucket, path); if (StringUtil.isNullOrEmpty(newPath)){ log.error("局部design图片上传失败");