From 3fdc508014c167ee5b1e4afca62fee7fb87b62e9 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期三, 06 八月 2025 09:40:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
framework/src/main/java/cn/lili/modules/lmk/service/impl/MyCollectServiceImpl.java | 32 ++++++++++++++++++++++----------
1 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/lmk/service/impl/MyCollectServiceImpl.java b/framework/src/main/java/cn/lili/modules/lmk/service/impl/MyCollectServiceImpl.java
index f4b64ea..abc3a70 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/service/impl/MyCollectServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/service/impl/MyCollectServiceImpl.java
@@ -4,10 +4,14 @@
import cn.lili.common.properties.RocketmqCustomProperties;
import cn.lili.common.security.context.UserContext;
import cn.lili.modules.goods.entity.vos.GoodsVO;
+import cn.lili.modules.lmk.domain.query.AuthorVideoQuery;
import cn.lili.modules.lmk.domain.vo.*;
+import cn.lili.modules.lmk.service.MySubscribeService;
+import cn.lili.modules.lmk.service.VideoService;
import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
import cn.lili.rocketmq.tags.CommentTagsEnum;
import cn.lili.rocketmq.tags.VideoTagsEnum;
+import cn.lili.utils.COSUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.metadata.IPage;
import cn.lili.modules.lmk.domain.entity.MyCollect;
@@ -18,15 +22,19 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cn.lili.modules.lmk.domain.form.MyCollectForm;
import cn.lili.modules.lmk.domain.query.MyCollectQuery;
+import com.xkcoding.http.util.StringUtil;
import org.apache.rocketmq.spring.core.RocketMQTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import lombok.RequiredArgsConstructor;
import cn.lili.utils.PageUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.util.Assert;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -43,6 +51,8 @@
private final RocketmqCustomProperties rocketmqCustomProperties;
private final LmkFileServiceImpl fileService;
private final RocketMQTemplate rocketMQTemplate;
+ private final VideoServiceMakeUpImpl serviceMakeUp;
+
/**
@@ -156,6 +166,9 @@
@Override
public List<SimpleMyCollectVO> getCollectsByVideoIds(List<String> videoIds) {
+ if (videoIds == null || videoIds.isEmpty()) {
+ return new ArrayList<>();
+ }
return baseMapper.getCollectsByVideoIds(videoIds, UserContext.getCurrentUserId());
}
@@ -179,14 +192,13 @@
activityVO.setUrl(fileService.getPreviewUrl(activityVO.getCover()));
}
}else if (CollectTypeEnum.video.getType().equals(query.getType())) {
- baseMapper.getVideoCollectPage(page, userId);
- List<VideoVO> videoList = page.getRecords().stream()
- .filter(obj -> obj instanceof VideoVO)
- .map(obj -> (VideoVO) obj)
- .collect(Collectors.toList());
- for (VideoVO video : videoList) {
- video.setCoverUrl(fileService.getPreviewUrl(video.getCoverUrl()));
- }
+ AuthorVideoQuery videoQuery = new AuthorVideoQuery();
+ videoQuery.setAuthorId(UserContext.getCurrentUserId());
+ videoQuery.setAuthorSelf(true);
+ videoQuery.setPageSize(query.getPageSize());
+
+ videoQuery.setPageNumber(query.getPageNumber());
+ return serviceMakeUp.getAuthorCollectVideoPage(videoQuery);
}else if (CollectTypeEnum.goods.getType().equals(query.getType())) {
baseMapper.getGoodsCollectPage(page, userId);
--
Gitblit v1.8.0