From 98ca2701567467a7394ed24863ffc9d64286b9da Mon Sep 17 00:00:00 2001
From: shahaibo <1023316923@qq.com>
Date: Wed, 29 Nov 2023 14:19:04 +0800
Subject: [PATCH] =?UTF-8?q?TASK:=20=E8=A3=81=E5=89=AA=E7=99=BD=E5=BA=95?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=B7=BB=E5=8A=A0;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/ai/da/model/vo/CollectionElementVO.java  | 2 ++
 src/main/java/com/ai/da/model/vo/UserLikeVO.java           | 1 -
 .../java/com/ai/da/service/impl/CollectionServiceImpl.java | 7 +++++++
 .../com/ai/da/service/impl/UserLikeGroupServiceImpl.java   | 7 -------
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/ai/da/model/vo/CollectionElementVO.java b/src/main/java/com/ai/da/model/vo/CollectionElementVO.java
index a9e0e2f6..ff4e5b88 100644
--- a/src/main/java/com/ai/da/model/vo/CollectionElementVO.java
+++ b/src/main/java/com/ai/da/model/vo/CollectionElementVO.java
@@ -38,4 +38,6 @@ public class CollectionElementVO {
     @ApiModelProperty("元素存放地址,绝对路径")
     private String minIOPath;
 
+    private String urlWithWhiteSide;
+
 }
diff --git a/src/main/java/com/ai/da/model/vo/UserLikeVO.java b/src/main/java/com/ai/da/model/vo/UserLikeVO.java
index 6ab88c77..589e8fc6 100644
--- a/src/main/java/com/ai/da/model/vo/UserLikeVO.java
+++ b/src/main/java/com/ai/da/model/vo/UserLikeVO.java
@@ -23,5 +23,4 @@ public class UserLikeVO {
     @ApiModelProperty("图片路径")
     private String designOutfitUrl;
     private String pictureName;
-    private String urlWithWhiteSide;
 }
diff --git a/src/main/java/com/ai/da/service/impl/CollectionServiceImpl.java b/src/main/java/com/ai/da/service/impl/CollectionServiceImpl.java
index a3d2ce5b..651e640f 100644
--- a/src/main/java/com/ai/da/service/impl/CollectionServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/CollectionServiceImpl.java
@@ -109,6 +109,13 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
                         d.setIsPin(o.getHasPin());
                         d.setDesignType(DesignTypeEnum.COLLECTION.getRealName());
                         d.setUrl(minioUtil.getPresignedUrl(o.getUrl(), 24 * 60));
+                        String url = o.getUrl();
+                        if (url.contains(".")) {
+                            String[] split = url.split("\\.");
+                            d.setUrlWithWhiteSide(minioUtil.getPresignedUrl(split[0] + "-show." + split[1], 24 * 60));
+                        }else {
+                            d.setUrlWithWhiteSide(minioUtil.getPresignedUrl(url + "-show", 24 * 60));
+                        }
                     }));
                     break;
                 case COLOR_BOARD:
diff --git a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java
index 0a7d0ab1..b9e73868 100644
--- a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java
@@ -124,13 +124,6 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
                 o.setPictureName(o.getUrl().substring(index + 1));
             }
             o.setDesignOutfitUrl(minioUtil.getPresignedUrl(o.getUrl(), 24 * 60));
-            String url = o.getUrl();
-            if (url.contains(".")) {
-                String[] split = url.split("\\.");
-                o.setUrlWithWhiteSide(minioUtil.getPresignedUrl(split[0] + "-show." + split[1], 24 * 60));
-            }else {
-                o.setUrlWithWhiteSide(minioUtil.getPresignedUrl(url + "-show", 24 * 60));
-            }
             QueryWrapper<TDesignPythonOutfit> qw = new QueryWrapper<>();
             qw.lambda().eq(TDesignPythonOutfit::getDesignItemId, o.getDesignItemId());
             List<TDesignPythonOutfit> tDesignPythonOutfits = designPythonOutfitMapper.selectList(qw);