From 0bcc66233bfe26a356c7ffa820f6a97a214a9b49 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 18 六月 2025 14:14:55 +0800
Subject: [PATCH] 视频接口完善

---
 framework/src/main/java/cn/lili/modules/lmk/service/impl/VideoServiceImpl.java |   51 +++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 41 insertions(+), 10 deletions(-)

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 9132498..b3cb333 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
@@ -314,17 +314,34 @@
             List<String> subscribes = mySubscribeService.getSubscribesByUserId(UserContext.getCurrentUserId());
             // 3. 鑾峰彇瑙嗛涓存椂璁块棶鍦板潃銆佽缃棰戞爣绛俱�佹垜鏄惁鏀惰棌銆佷綔鑰呮槸鍚﹀叧娉�
             page.getRecords().forEach(v -> {
-                v.setGoods(new VideoGoodsVO());
                 v.setTagList(tagMap.get(v.getId()));
                 v.setCollected(CollectionUtils.isNotEmpty(collectMap.get(v.getId())));
                 if (VideoContentTypeEnum.VIDEO.getValue().equals(v.getVideoContentType())) {
-                    //                v.setVideoUrl(cosUtil.getPreviewUrl(v.getVideoFileKey()));
-                    v.setVideoUrl("https://videos.pexels.com/video-files/13602965/13602965-hd_1920_1080_30fps.mp4");
+                    v.setVideoUrl(cosUtil.getPreviewUrl(v.getVideoFileKey()));
+                    v.setCoverUrl(cosUtil.getPreviewUrl(v.getCoverFileKey()));
                 } else if (VideoContentTypeEnum.IMG.getValue().equals(v.getVideoContentType()) && StringUtils.isNotBlank(v.getVideoImgs())) {
                     v.setImgs(JSON.parseArray(v.getVideoImgs(), String.class).stream().map(fileKey -> cosUtil.getPreviewUrl(fileKey)).collect(Collectors.toList()));
                 }
-                v.setCoverUrl(cosUtil.getPreviewUrl(v.getCoverFileKey()));
+
                 v.setSubscribeThisAuthor(subscribes.contains(v.getAuthorId()));
+            });
+        }
+        return Result.ok().data(page.getRecords());
+    }
+
+    @Override
+    public Result healthRecommendVideo(WxHealthVideoQuery query) {
+        IPage<WxVideoVO> page = PageUtil.getPage(query, WxVideoVO.class);
+        //鑾峰彇澶у仴搴疯棰戝垪琛�
+                baseMapper.recommendHealthVideo(page,query);
+        if (page.getTotal() > 0) {
+            page.getRecords().forEach(v -> {
+                if (VideoContentTypeEnum.VIDEO.getValue().equals(v.getVideoContentType())) {
+                    v.setVideoUrl(cosUtil.getPreviewUrl(v.getVideoFileKey()));
+                    v.setCoverUrl(cosUtil.getPreviewUrl(v.getCoverFileKey()));
+                } else if (VideoContentTypeEnum.IMG.getValue().equals(v.getVideoContentType()) && StringUtils.isNotBlank(v.getVideoImgs())) {
+                    v.setImgs(JSON.parseArray(v.getVideoImgs(), String.class).stream().map(cosUtil::getPreviewUrl).collect(Collectors.toList()));
+                }
             });
         }
         return Result.ok().data(page.getRecords());
@@ -382,9 +399,14 @@
         query.setAuthorSelf(UserContext.getCurrentUserId().equals(query.getAuthorId()));
         baseMapper.getAuthorVideoPage(page, query);
         for (WxVideoVO vo : page.getRecords()) {
-            vo.setCoverUrl(cosUtil.getPreviewUrl(vo.getCoverFileKey()));
-//            vo.setVideoUrl(cosUtil.getPreviewUrl(vo.getVideoFileKey()));
-            vo.setVideoUrl("https://videos.pexels.com/video-files/13602965/13602965-hd_1920_1080_30fps.mp4");
+            if (VideoContentTypeEnum.VIDEO.getValue().equals(vo.getVideoContentType())) {
+                vo.setVideoUrl(cosUtil.getPreviewUrl(vo.getVideoFileKey()));
+                vo.setCoverUrl(cosUtil.getPreviewUrl(vo.getCoverFileKey()));
+            } else if (VideoContentTypeEnum.IMG.getValue().equals(vo.getVideoContentType()) && StringUtils.isNotBlank(vo.getVideoImgs())) {
+                vo.setImgs(JSON.parseArray(vo.getVideoImgs(), String.class).stream().map(fileKey -> cosUtil.getPreviewUrl(fileKey)).collect(Collectors.toList()));
+            }
+
+
             vo.setOptions(VideoSupportOpEnum.getVideoOpByStatus(vo.getStatus()));
         }
         return Result.ok().data(page.getRecords()).total(page.getTotal());
@@ -395,15 +417,24 @@
         IPage<WxVideoVO> page = PageUtil.getPage(query, WxVideoVO.class);
         baseMapper.getAuthorCollectVideoPage(page, query);
         for (WxVideoVO vo : page.getRecords()) {
-            vo.setCoverUrl(cosUtil.getPreviewUrl(vo.getCoverFileKey()));
-//            vo.setVideoUrl(cosUtil.getPreviewUrl(vo.getVideoFileKey()));
-            vo.setVideoUrl("https://videos.pexels.com/video-files/13602965/13602965-hd_1920_1080_30fps.mp4");
+            if (VideoContentTypeEnum.VIDEO.getValue().equals(vo.getVideoContentType())) {
+                vo.setVideoUrl(cosUtil.getPreviewUrl(vo.getVideoFileKey()));
+                vo.setCoverUrl(cosUtil.getPreviewUrl(vo.getCoverFileKey()));
+            } else if (VideoContentTypeEnum.IMG.getValue().equals(vo.getVideoContentType()) && StringUtils.isNotBlank(vo.getVideoImgs())) {
+                vo.setImgs(JSON.parseArray(vo.getVideoImgs(), String.class).stream().map(fileKey -> cosUtil.getPreviewUrl(fileKey)).collect(Collectors.toList()));
+            }
             vo.setCollected(Boolean.TRUE);
         }
         return Result.ok().data(page.getRecords()).total(page.getTotal());
     }
 
     @Override
+    public Result getGoodsDetail(String videoId) {
+        List<VideoGoodsDetailVO> goodsList = baseMapper.getVideoGoods(videoId);
+        return Result.ok().data(goodsList);
+    }
+
+    @Override
     @Transactional(rollbackFor = Exception.class)
     public Result homePageInfoEdit(VideoHomePageInfoForm form) {
         new LambdaUpdateChainWrapper<>(memberService.getBaseMapper())

--
Gitblit v1.8.0