From 4318746ee88ad53e00341df1a0395058bebc40fa Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 25 六月 2025 14:33:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
framework/src/main/java/cn/lili/modules/lmk/service/impl/MyCollectServiceImpl.java | 43 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 41 insertions(+), 2 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 2b513d9..28eb4e8 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
@@ -1,7 +1,9 @@
package cn.lili.modules.lmk.service.impl;
+import cn.lili.common.enums.CollectTypeEnum;
import cn.lili.common.security.context.UserContext;
-import cn.lili.modules.lmk.domain.vo.SimpleMyCollectVO;
+import cn.lili.modules.goods.entity.vos.GoodsVO;
+import cn.lili.modules.lmk.domain.vo.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import cn.lili.modules.lmk.domain.entity.MyCollect;
import cn.lili.modules.lmk.mapper.MyCollectMapper;
@@ -10,7 +12,6 @@
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cn.lili.modules.lmk.domain.form.MyCollectForm;
-import cn.lili.modules.lmk.domain.vo.MyCollectVO;
import cn.lili.modules.lmk.domain.query.MyCollectQuery;
import org.springframework.stereotype.Service;
import lombok.RequiredArgsConstructor;
@@ -34,6 +35,7 @@
private final MyCollectMapper myCollectMapper;
+ private final LmkFileServiceImpl fileService;
/**
* 娣诲姞
* @param form
@@ -137,4 +139,41 @@
public List<SimpleMyCollectVO> getCollectsByVideoIds(List<String> videoIds) {
return baseMapper.getCollectsByVideoIds(videoIds, UserContext.getCurrentUserId());
}
+
+ @Override
+ public List<CollectTypeNumVO> countNumGroupByType(String type) {
+ return baseMapper.countNumGroupByType(type);
+ }
+
+
+ @Override
+ public Result getMyCollectList(MyCollectQuery query) {
+ String userId = UserContext.getCurrentUserId();
+ IPage<Object> page = PageUtil.getPage(query, Object.class);
+ if (CollectTypeEnum.activity.getType().equals(query.getType())){
+ baseMapper.getActivityCollectPage(page, userId);
+ List<ActivityVO> activityVOS = page.getRecords().stream()
+ .filter(obj -> obj instanceof ActivityVO)
+ .map(obj -> (ActivityVO) obj)
+ .collect(Collectors.toList());
+ for (ActivityVO activityVO : activityVOS) {
+ 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()));
+ }
+ }else if (CollectTypeEnum.goods.getType().equals(query.getType())) {
+ baseMapper.getGoodsCollectPage(page, userId);
+
+ }
+
+ return Result.ok().data(page.getRecords()).total(page.getTotal());
+ }
+
}
--
Gitblit v1.8.0