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

peng

2025-06-13 30b41cc526165b70e04a1fe1438cb79bb035a7bf

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

 framework/src/main/java/cn/lili/modules/lmk/domain/form/WxVideoForm.java

@@ -29,7 +29,7 @@
public class WxVideoForm extends AbsForm {


    @NotBlank(message = "视频不能为空", groups = {Add.class, Update.class})
//    @NotBlank(message = "视频不能为空", groups = {Add.class, Update.class})
    @ApiModelProperty("视频")
    private String videoFileKey;

@@ -38,7 +38,7 @@
    private String title;

    @ApiModelProperty("视频封面")
    @NotBlank(message = "视频封面不能为空", groups = {Add.class, Update.class})
//    @NotBlank(message = "视频封面不能为空", groups = {Add.class, Update.class})
    private String cover;

    @ApiModelProperty("视频内容类型：视频、图片")

 framework/src/main/java/cn/lili/modules/lmk/domain/vo/WxVideoVO.java

@@ -42,6 +42,24 @@
    private String videoFileKey;
    private String videoUrl;

    /**
     * @see cn.lili.modules.lmk.enums.general.VideoContentTypeEnum
     */
    @ApiModelProperty("视频内容类型：视频、图片")
    private String videoContentType;

    /**
     * @see cn.lili.modules.lmk.enums.general.VideoTypeEnum
     */
    @ApiModelProperty("视频类型：视频、大健康、神厨")
    private String videoType;

    @ApiModelProperty("图集-json数组")
    private String videoImgs;

    @ApiModelProperty("图集")
    private List<String> imgs;

    @ApiModelProperty("视频标签")
    private List<SimpleVideoTagVO> tagList;


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

@@ -14,6 +14,7 @@
import cn.lili.modules.member.service.FootprintService;
import cn.lili.modules.member.service.MemberService;
import cn.lili.utils.COSUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.metadata.IPage;
import cn.lili.modules.lmk.mapper.VideoMapper;
import cn.lili.base.Result;
@@ -130,7 +131,11 @@
        Assert.notNull(vo, "记录不存在");
        List<SimpleVideoTagVO> tags = videoTagRefService.getTagsByVideoIds(Arrays.asList(id));
        vo.setTagList(tags);
        vo.setVideoUrl(cosUtil.getPreviewUrl(vo.getVideoFileKey()));
        if (VideoContentTypeEnum.VIDEO.getValue().equals(vo.getVideoContentType())) {
            vo.setVideoUrl(cosUtil.getPreviewUrl(vo.getVideoFileKey()));
        } 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()));
        }
        return Result.ok().data(vo);
    }

@@ -156,6 +161,9 @@
        video.setStatus(VideoStatusEnum.AUDITING.getValue());
        video.setCoverUrl(form.getCover());
        video.setVideoType(VideoTypeEnum.VIDEO.getValue());
        if (VideoContentTypeEnum.IMG.getValue().equals(form.getVideoContentType())) {
            video.setVideoImgs(JSON.toJSONString(form.getVideoImgs()));
        }
        baseMapper.insert(video);
        // 2.处理标签
        List<VideoTagRef> videoTagRefs = form.getTags().stream().map(tag -> {
@@ -296,8 +304,12 @@
                v.setGoods(new VideoGoodsVO());
                v.setTagList(tagMap.get(v.getId()));
                v.setCollected(CollectionUtils.isNotEmpty(collectMap.get(v.getId())));
//                v.setVideoUrl(cosUtil.getPreviewUrl(v.getVideoFileKey()));
                v.setVideoUrl("https://videos.pexels.com/video-files/13602965/13602965-hd_1920_1080_30fps.mp4");
                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");
                } 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()));
            });

 framework/src/main/resources/mapper/lmk/VideoMapper.xml

@@ -41,6 +41,9 @@
        <result column="collect_num" property="collectNum" />
        <result column="comment_num" property="commentNum" />
        <result column="status" property="status" />
        <result column="video_content_type" property="videoContentType" />
        <result column="video_type" property="videoType" />
        <result column="video_imgs" property="videoImgs" />
    </resultMap>