From 09c1e21cad0b474babb1d2f67f481b582adf0b0f Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 29 七月 2025 14:43:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
framework/src/main/java/cn/lili/modules/lmk/service/impl/MyCollectServiceImpl.java | 29 ++++-------------------------
1 files changed, 4 insertions(+), 25 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 d5cd650..c2ae06e 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
@@ -6,6 +6,7 @@
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;
@@ -24,6 +25,7 @@
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;
@@ -52,14 +54,8 @@
private final RocketmqCustomProperties rocketmqCustomProperties;
private final LmkFileServiceImpl fileService;
private final RocketMQTemplate rocketMQTemplate;
- private VideoService videoService; // 绉婚櫎浜唂inal
- private COSUtil cOSUtil;
+ private final VideoServiceMakeUpImpl serviceMakeUp;
- @Autowired
- public void setVideoService(VideoService videoService) {
- // 杩欓噷鍙互娣诲姞棰濆鐨勫垵濮嬪寲閫昏緫
- this.videoService = videoService;
- }
/**
@@ -202,24 +198,7 @@
videoQuery.setPageSize(query.getPageSize());
videoQuery.setPageNumber(query.getPageNumber());
- Result result = videoService.getAuthorCollectVideoPage(videoQuery);
- List<WxVideoVO> list = Optional.ofNullable(result.get("data"))
- .filter(data -> data instanceof List<?>)
- .map(data -> (List<?>) data)
- .orElse(Collections.emptyList())
- .stream()
- .filter(WxVideoVO.class::isInstance)
- .map(WxVideoVO.class::cast)
- .collect(Collectors.toList());
- for (WxVideoVO wxVideoVO : list){
- if (!CollectionUtils.isEmpty(wxVideoVO.getImgs())){
- List<String> newImages = wxVideoVO
- .getImgs().stream().map(item -> cOSUtil.getPreviewUrl(item)).collect(Collectors.toList());
- wxVideoVO.setImgs(newImages);
- }
-
- }
- return result;
+ return serviceMakeUp.getAuthorCollectVideoPage(videoQuery);
}else if (CollectTypeEnum.goods.getType().equals(query.getType())) {
baseMapper.getGoodsCollectPage(page, userId);
--
Gitblit v1.8.0