From 45fccac802160458965a727bb21056abfc3bc528 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 03 六月 2025 18:40:15 +0800
Subject: [PATCH] 视频主页-视频播放接口适配

---
 buyer-api/src/main/java/cn/lili/controller/lmk/VideoController.java            |    2 +-
 framework/src/main/java/cn/lili/modules/lmk/service/VideoService.java          |    4 ++--
 framework/src/main/java/cn/lili/modules/lmk/service/impl/VideoServiceImpl.java |   21 ++++++++++++++++++---
 framework/src/main/java/cn/lili/modules/lmk/domain/query/VideoQuery.java       |    7 +++++++
 4 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/buyer-api/src/main/java/cn/lili/controller/lmk/VideoController.java b/buyer-api/src/main/java/cn/lili/controller/lmk/VideoController.java
index 68671ba..9b3a130 100644
--- a/buyer-api/src/main/java/cn/lili/controller/lmk/VideoController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/lmk/VideoController.java
@@ -69,7 +69,7 @@
 
     @GetMapping("/recommend")
     @ApiOperation(value = "瑙嗛鎺ㄨ崘", notes = "瑙嗛鎺ㄨ崘")
-    public Result recommendVideo(AbsQuery query) {
+    public Result recommendVideo(VideoQuery query) {
         return videoService.recommendVideo(query);
     }
 
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/query/VideoQuery.java b/framework/src/main/java/cn/lili/modules/lmk/domain/query/VideoQuery.java
index df533f0..ac1a18d 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/domain/query/VideoQuery.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/query/VideoQuery.java
@@ -18,5 +18,12 @@
 @Data
 @ApiModel(value = "Video鏌ヨ鍙傛暟", description = "瑙嗛鍐呭鏌ヨ鍙傛暟")
 public class VideoQuery extends AbsQuery {
+
+    @ApiModelProperty("浣滆�卛d")
+    private String authorId;
+
+    @ApiModelProperty("瑙嗛鏉ユ簮锛歳ecommend鎺ㄨ崘銆乤uthor鏌愪綔鑰呯殑瑙嗛銆乧ollect鏌愪綔鑰呮敹钘忕殑瑙嗛")
+    private String videoFrom;
+
 }
 
diff --git a/framework/src/main/java/cn/lili/modules/lmk/service/VideoService.java b/framework/src/main/java/cn/lili/modules/lmk/service/VideoService.java
index 0acc5ad..09a274d 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/service/VideoService.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/service/VideoService.java
@@ -1,6 +1,5 @@
 package cn.lili.modules.lmk.service;
 
-import cn.lili.base.AbsQuery;
 import cn.lili.modules.lmk.domain.entity.Video;
 import cn.lili.modules.lmk.domain.form.*;
 import cn.lili.modules.lmk.domain.query.AuthorVideoQuery;
@@ -119,8 +118,9 @@
      * 灏忕▼搴忕鐨勮棰戞帹鑽愭帴鍙�
      *
      * @return
+     * @param query
      */
-    Result recommendVideo(AbsQuery query);
+    Result recommendVideo(VideoQuery query);
 
     /**
      * 鎵归噺鏇存柊瑙嗛鏀惰棌鏁伴噺
diff --git a/framework/src/main/java/cn/lili/modules/lmk/service/impl/VideoServiceImpl.java b/framework/src/main/java/cn/lili/modules/lmk/service/impl/VideoServiceImpl.java
index e712108..ef88f79 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/service/impl/VideoServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/service/impl/VideoServiceImpl.java
@@ -1,6 +1,5 @@
 package cn.lili.modules.lmk.service.impl;
 
-import cn.lili.base.AbsQuery;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.modules.lmk.domain.entity.VideoAuditRecord;
 import cn.lili.modules.lmk.domain.entity.VideoTag;
@@ -261,10 +260,26 @@
     }
 
     @Override
-    public Result recommendVideo(AbsQuery query) {
+    public Result recommendVideo(VideoQuery query) {
         // 鎺ㄨ崘绠楁硶锛� 1. 鏍规嵁鐢ㄦ埛鐨勬敹钘忚棰戠殑鏍囩  2. 鏍规嵁鐢ㄦ埛鍏虫敞鐨勪綔鑰呯殑鍏跺畠瑙嗛  3. 鏍规嵁鐢ㄦ埛鐨勮鐪嬭褰曪紙瑙傜湅鏃堕暱杈冮暱鐨勩�侀噸澶嶈鐪嬫鏁拌緝澶氱殑锛� 4. 鍩轰簬鐩镐技鐢ㄦ埛鐨勮鐪嬭涓烘潵缁欒鐢ㄦ埛鎺ㄨ崘
         IPage<WxVideoVO> page = PageUtil.getPage(query, WxVideoVO.class);
-        baseMapper.recommendVideo(page);
+        switch (query.getVideoFrom()) {
+            case "recommend":
+                baseMapper.recommendVideo(page);
+                break;
+            case "author":
+                AuthorVideoQuery query1 = new AuthorVideoQuery();
+                query1.setAuthorId(query.getAuthorId());
+                baseMapper.getAuthorVideoPage(page, query1);
+                break;
+            case "collect":
+                AuthorVideoQuery query2 = new AuthorVideoQuery();
+                query2.setAuthorId(query.getAuthorId());
+                baseMapper.getAuthorVideoPage(page, query2);
+                break;
+            default:
+                break;
+        }
         if (page.getTotal() > 0) {
             List<String> videoIds = page.getRecords().stream().map(WxVideoVO::getId).collect(Collectors.toList());
             Map<String, List<SimpleVideoTagVO>> tagMap = videoTagRefService.getTagsByVideoIds(videoIds)

--
Gitblit v1.8.0