From 9c162f7ab839c0927e55dd9ca3f42b621bef19f5 Mon Sep 17 00:00:00 2001
From: shahaibo <1023316923@qq.com>
Date: Wed, 11 Oct 2023 11:03:31 +0800
Subject: [PATCH] =?UTF-8?q?TASK:retrive=E8=BF=94=E5=9B=9E=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=9B=BE=E7=89=87=E5=90=8D=E7=A7=B0;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/ai/da/model/vo/UserLikeCollectionVO.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   | 4 ++++
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ai/da/model/vo/UserLikeCollectionVO.java b/src/main/java/com/ai/da/model/vo/UserLikeCollectionVO.java
index 52152b89..4e5f5721 100644
--- a/src/main/java/com/ai/da/model/vo/UserLikeCollectionVO.java
+++ b/src/main/java/com/ai/da/model/vo/UserLikeCollectionVO.java
@@ -16,8 +16,8 @@ public class UserLikeCollectionVO {
     @ApiModelProperty("mood版本id 没有传null")
     private String moodTemplateId;
 
-    @ApiModelProperty("mood版本id 没有传null")
     private String moodTemplateUrl;
+    private String moodTemplateName;
 
     @ApiModelProperty("情绪板图片 数组")
     private List<CollectionElementVO> moodBoards;
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 ab1eaf71..3306e9da 100644
--- a/src/main/java/com/ai/da/model/vo/UserLikeVO.java
+++ b/src/main/java/com/ai/da/model/vo/UserLikeVO.java
@@ -22,5 +22,6 @@ public class UserLikeVO {
     private String url;
     @ApiModelProperty("图片路径")
     private String designOutfitUrl;
+    private String pictureName;
 
 }
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 d7adf712..3956a076 100644
--- a/src/main/java/com/ai/da/service/impl/CollectionServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/CollectionServiceImpl.java
@@ -28,6 +28,7 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -76,7 +77,11 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
         response.setCollectionId(id);
         response.setMoodTemplateId(collection.getMoodTemplateId());
         if (collection.getMoodTemplateId() != null) {
-            response.setMoodTemplateUrl(minioUtil.getPresignedUrl(collectionElementService.getById(response.getMoodTemplateId()).getUrl(), 10));
+            CollectionElement byId = collectionElementService.getById(response.getMoodTemplateId());
+            if (Objects.nonNull(byId)) {
+                response.setMoodTemplateName(byId.getName());
+                response.setMoodTemplateUrl(minioUtil.getPresignedUrl(byId.getUrl(), 10));
+            }
         }
         Map<String,List<CollectionElement>> maps = collectionElements
                 .stream()
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 50ef52e7..34f836c1 100644
--- a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java
@@ -107,6 +107,10 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
         Assert.notNull(group,"History does not exist!");
         List<UserLikeVO> userLikeVOS = userLikeService.getGroupDetail(userGroupId);
         userLikeVOS.forEach(o -> {
+            if (o.getUrl().contains("/")) {
+                int index = o.getUrl().lastIndexOf("/");
+                o.setPictureName(o.getUrl().substring(index + 1));
+            }
             o.setDesignOutfitUrl(minioUtil.getPresignedUrl(o.getUrl(), 10));
             QueryWrapper<TDesignPythonOutfit> qw = new QueryWrapper<>();
             qw.lambda().eq(TDesignPythonOutfit::getDesignItemId, o.getDesignItemId());