Merge remote-tracking branch 'origin/dev' into dev

peng

8 天以前 b83b070dc8cc823c877aa3a2ade134272ec0641a

 framework/src/main/java/cn/lili/modules/lmk/service/impl/VideoServiceImpl.java

@@ -492,11 +492,22 @@
                baseMapper.getAuthorLikeVideoPage(page, query3);
                break;
            case "search":  // 加载es搜索视频
                VideoEsQuery query4 = new VideoEsQuery();
                BeanUtils.copyProperties(query, query4);
                query4.setPageNumber((int) query.getPageNumber());
                query4.setPageSize((int) query.getPageSize());
                return this.esSearch(query4);
                VideoEsQuery videoEsQuery = new VideoEsQuery();
                BeanUtils.copyProperties(query, videoEsQuery);
                videoEsQuery.setPageNumber((int) query.getPageNumber());
                videoEsQuery.setPageSize((int) query.getPageSize());
                return this.esSearch(videoEsQuery);
            case "goodsSimilarly": // 悬挂相同商品的推荐视频
                GoodsSimilarlyQuery goodsSimilarlyQuery = new GoodsSimilarlyQuery();
                BeanUtils.copyProperties(query, goodsSimilarlyQuery);
                baseMapper.goodsSimilarlyPage(page, goodsSimilarlyQuery);
                break;
            case "history":
                VideoHistoryQuery videoHistoryQuery = new VideoHistoryQuery();
                BeanUtils.copyProperties(query, videoHistoryQuery);
                videoHistoryQuery.setUserId(UserContext.getCurrentUserId());
                baseMapper.getHistoryPage(page, videoHistoryQuery);
                break;
            default:
                break;
        }
@@ -520,6 +531,7 @@
                v.setCommentNum(this.getCommentNum(v.getId(), v.getCommentNum()));
                v.setCollectNum(this.getCollectNum(v.getId(), v.getCollectNum()));
                v.setThumbsUpNum(this.getThumbsUpNum(v.getId(), v.getThumbsUpNum()));
                v.setAuthorAvatar(cosUtil.getPreviewUrl(v.getAuthorAvatar()));
                if (VideoContentTypeEnum.VIDEO.getValue().equals(v.getVideoContentType())) {
                    v.setVideoUrl(cosUtil.getPreviewUrl(v.getVideoFileKey()));
                    v.setCoverUrl(cosUtil.getPreviewUrl(v.getCoverFileKey()));
@@ -592,9 +604,10 @@
    public Result healthRecommendVideo(WxHealthVideoQuery query) {
        IPage<WxVideoVO> page = PageUtil.getPage(query, WxVideoVO.class);
        //获取大健康视频列表
                baseMapper.recommendHealthVideo(page,query);
        baseMapper.recommendHealthVideo(page,query);
        if (page.getTotal() > 0) {
            page.getRecords().forEach(v -> {
                v.setAuthorAvatar(cosUtil.getPreviewUrl(v.getAuthorAvatar()));
                if (VideoContentTypeEnum.VIDEO.getValue().equals(v.getVideoContentType())) {
                    v.setVideoUrl(cosUtil.getPreviewUrl(v.getVideoFileKey()));
                    v.setCoverUrl(cosUtil.getPreviewUrl(v.getCoverFileKey()));
@@ -617,6 +630,7 @@
        IPage<WxVideoVO> page = PageUtil.getPage(query, WxVideoVO.class);
         baseMapper.wxKitchenVideoQuery(page, query);
         page.getRecords().forEach(v -> {
             v.setAuthorAvatar(cosUtil.getPreviewUrl(v.getAuthorAvatar()));
             if (VideoContentTypeEnum.VIDEO.getValue().equals(v.getVideoContentType())) {
                 v.setVideoUrl(cosUtil.getPreviewUrl(v.getVideoFileKey()));
                 v.setCoverUrl(cosUtil.getPreviewUrl(v.getCoverFileKey()));
@@ -667,13 +681,24 @@

    @Override
    public Result saveViewRecord(VideoFootPrintForm form) {
        FootPrint footPrint = new FootPrint();
        footPrint.setViewType(ViewTypeEnum.VIDEO.getValue());
        footPrint.setRefId(form.getVideoId());
        footPrint.setMemberId(UserContext.getCurrentUserId());
        footPrint.setViewDuration(form.getViewDuration());
        footPrint.setPlayAt(form.getPlayAt());
        footprintService.saveFootprint(footPrint);
        FootPrint one = new LambdaQueryChainWrapper<>(footprintService.getBaseMapper())
                .eq(FootPrint::getRefId, form.getVideoId())
                .eq(FootPrint::getMemberId, UserContext.getCurrentUserId())
                .eq(FootPrint::getViewType, ViewTypeEnum.VIDEO.getValue())
                .one();
        if (Objects.nonNull(one)) {
            one.setViewDuration(one.getViewDuration() + form.getViewDuration());
            one.setPlayAt(form.getPlayAt());
            footprintService.updateById(one);
        } else {
            FootPrint footPrint = new FootPrint();
            footPrint.setViewType(ViewTypeEnum.VIDEO.getValue());
            footPrint.setRefId(form.getVideoId());
            footPrint.setMemberId(UserContext.getCurrentUserId());
            footPrint.setViewDuration(form.getViewDuration());
            footPrint.setPlayAt(form.getPlayAt());
            footprintService.saveFootprint(footPrint);
        }
        return Result.ok();
    }

@@ -715,6 +740,7 @@
                v.setCommentNum(this.getCommentNum(v.getId(), v.getCommentNum()));
                v.setCollectNum(this.getCollectNum(v.getId(), v.getCollectNum()));
                v.setThumbsUpNum(this.getThumbsUpNum(v.getId(), v.getThumbsUpNum()));
                v.setAuthorAvatar(cosUtil.getPreviewUrl(v.getAuthorAvatar()));
                if (VideoContentTypeEnum.VIDEO.getValue().equals(v.getVideoContentType())) {
                    v.setVideoUrl(cosUtil.getPreviewUrl(v.getVideoFileKey()));
                    v.setCoverUrl(cosUtil.getPreviewUrl(v.getCoverFileKey()));
@@ -753,6 +779,7 @@
                v.setCommentNum(this.getCommentNum(v.getId(), v.getCommentNum()));
                v.setCollectNum(this.getCollectNum(v.getId(), v.getCollectNum()));
                v.setThumbsUpNum(this.getThumbsUpNum(v.getId(), v.getThumbsUpNum()));
                v.setAuthorAvatar(cosUtil.getPreviewUrl(v.getAuthorAvatar()));
                if (VideoContentTypeEnum.VIDEO.getValue().equals(v.getVideoContentType())) {
                    v.setVideoUrl(cosUtil.getPreviewUrl(v.getVideoFileKey()));
                    v.setCoverUrl(cosUtil.getPreviewUrl(v.getCoverFileKey()));
@@ -790,6 +817,7 @@
                v.setCommentNum(this.getCommentNum(v.getId(), v.getCommentNum()));
                v.setCollectNum(this.getCollectNum(v.getId(), v.getCollectNum()));
                v.setThumbsUpNum(this.getThumbsUpNum(v.getId(), v.getThumbsUpNum()));
                v.setAuthorAvatar(cosUtil.getPreviewUrl(v.getAuthorAvatar()));
                if (VideoContentTypeEnum.VIDEO.getValue().equals(v.getVideoContentType())) {
                    v.setVideoUrl(cosUtil.getPreviewUrl(v.getVideoFileKey()));
                    v.setCoverUrl(cosUtil.getPreviewUrl(v.getCoverFileKey()));
@@ -1194,6 +1222,7 @@
            // 判断是否关注作者、是否点赞、是否收藏
            wxVideoVO.setCollected(CollectionUtils.isNotEmpty(collectMap.get(wxVideoVO.getId())));
            wxVideoVO.setThumbsUp(CollectionUtils.isNotEmpty(thumbsUpMap.get(wxVideoVO.getId())));
            wxVideoVO.setAuthorAvatar(cosUtil.getPreviewUrl(wxVideoVO.getAuthorAvatar()));
            if (UserContext.getCurrentUserId().equals(wxVideoVO.getAuthorId())) {
                wxVideoVO.setSubscribeThisAuthor(Boolean.TRUE);
            } else {
@@ -1210,4 +1239,49 @@
        }).collect(Collectors.toList());
        return Result.ok().data(vos).total(searchHits.getTotalHits());
    }

    @Override
    public Result getHistoryPage(VideoHistoryQuery query) {
        query.setUserId(UserContext.getCurrentUserId());
        IPage<VideoHistoryVO> page = PageUtil.getPage(query, VideoHistoryVO.class);
        baseMapper.getHistoryPage(page, query);
        if (CollectionUtils.isNotEmpty(page.getRecords())) {
            if (page.getTotal() > 0) {
                List<String> videoIds = page.getRecords().stream().map(VideoHistoryVO::getId).collect(Collectors.toList());
                Map<String, List<SimpleVideoTagVO>> tagMap = videoTagRefService.getTagsByVideoIds(videoIds)
                        .stream()
                        .collect(Collectors.groupingBy(SimpleVideoTagVO::getVideoId));
                Map<String, List<SimpleMyCollectVO>> collectMap = myCollectService.getCollectsByVideoIds(videoIds)
                        .stream()
                        .collect(Collectors.groupingBy(SimpleMyCollectVO::getRefId));
                Map<String, List<SimpleMyThumbsUpVO>> thumbsUpMap = thumbsUpRecordService.getThumbssByVideoIds(videoIds)
                        .stream()
                        .collect(Collectors.groupingBy(SimpleMyThumbsUpVO::getRefId));
                List<String> subscribes = mySubscribeService.getSubscribesByUserId(UserContext.getCurrentUserId());
                // 3. 获取视频临时访问地址、设置视频标签、我是否收藏、是否点赞、作者是否关注
                page.getRecords().forEach(v -> {
                    v.setTagList(tagMap.get(v.getId()));
                    v.setCollected(CollectionUtils.isNotEmpty(collectMap.get(v.getId())));
                    v.setThumbsUp(CollectionUtils.isNotEmpty(thumbsUpMap.get(v.getId())));
                    v.setCommentNum(this.getCommentNum(v.getId(), v.getCommentNum()));
                    v.setCollectNum(this.getCollectNum(v.getId(), v.getCollectNum()));
                    v.setThumbsUpNum(this.getThumbsUpNum(v.getId(), v.getThumbsUpNum()));
                    v.setAuthorAvatar(cosUtil.getPreviewUrl(v.getAuthorAvatar()));
                    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(fileKey -> cosUtil.getPreviewUrl(fileKey)).collect(Collectors.toList()));
                    }
                    if (CollectionUtils.isNotEmpty(v.getGoodsList())) {
                        v.getGoodsList().stream().forEach(goods -> {
                            goods.setThumbnail(cosUtil.getPreviewUrl(goods.getThumbnail()));
                        });
                    }
                    v.setSubscribeThisAuthor(subscribes.contains(v.getAuthorId()));
                });
            }
        }
        return Result.ok().data(page.getRecords()).total(page.getTotal());
    }
}