From aac2321d1cf5536f7ea03f30d55a4aba30fbf710 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期三, 02 七月 2025 10:39:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
framework/src/main/resources/mapper/lmk/VideoMapper.xml | 219 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 204 insertions(+), 15 deletions(-)
diff --git a/framework/src/main/resources/mapper/lmk/VideoMapper.xml b/framework/src/main/resources/mapper/lmk/VideoMapper.xml
index d51fd28..230ad1a 100644
--- a/framework/src/main/resources/mapper/lmk/VideoMapper.xml
+++ b/framework/src/main/resources/mapper/lmk/VideoMapper.xml
@@ -17,19 +17,19 @@
<result column="play_num" property="playNum" />
<result column="collect_num" property="collectNum" />
<result column="comment_num" property="commentNum" />
+ <result column="thumbs_up_num" property="thumbsUpNum" />
<result column="weight" property="weight" />
<result column="audit_pass_time" property="auditPassTime" />
<result column="update_time" property="updateTime" />
<result column="video_content_type" property="videoContentType" />
<result column="video_type" property="videoType" />
<result column="video_imgs" property="videoImgs" />
- <collection property="goodsList" column="id" select="getVideoGoods" ofType="cn.lili.modules.lmk.domain.vo.VideoGoodsDetailVO">
-
- </collection>
+ <collection property="goodsList" column="id" select="getVideoGoods" ofType="cn.lili.modules.lmk.domain.vo.VideoGoodsDetailVO"/>
</resultMap>
<resultMap id="VideoGoodsMap" type="cn.lili.modules.lmk.domain.vo.VideoGoodsDetailVO">
<result column="goods_id" property="goodsId"/>
+ <result column="goods_sku_id" property="id"/>
<result column="goods_num" property="goodsNum"/>
<result column="goods_name" property="goodsName"/>
<result column="thumbnail" property="thumbnail"/>
@@ -39,6 +39,7 @@
<select id="getVideoGoods" parameterType="string" resultMap="VideoGoodsMap">
SELECT
LVG.goods_id,
+ LVG.goods_sku_id,
LVG.goods_num,
LVG.order_num,
LG.goods_name,
@@ -70,6 +71,7 @@
<result column="play_num" property="playNum" />
<result column="collect_num" property="collectNum" />
<result column="comment_num" property="commentNum" />
+ <result column="thumbs_up_num" property="thumbsUpNum" />
<result column="weight" property="weight" />
<result column="audit_pass_time" property="auditPassTime" />
<result column="update_time" property="updateTime" />
@@ -87,13 +89,16 @@
<result column="cover_url" property="coverFileKey" />
<result column="video_file_key" property="videoFileKey" />
<result column="video_fit" property="videoFit" />
+ <result column="video_duration" property="videoDuration" />
<result column="title" property="title" />
<result column="collect_num" property="collectNum" />
<result column="comment_num" property="commentNum" />
+ <result column="thumbs_up_num" property="thumbsUpNum" />
<result column="status" property="status" />
<result column="video_content_type" property="videoContentType" />
<result column="video_type" property="videoType" />
<result column="video_imgs" property="videoImgs" />
+ <collection property="goodsList" column="id" select="getVideoGoods" ofType="cn.lili.modules.lmk.domain.vo.VideoGoodsDetailVO"/>
</resultMap>
@@ -112,6 +117,7 @@
LV.play_num,
LV.collect_num,
LV.comment_num,
+ LV.thumbs_up_num,
LV.weight,
LV.audit_pass_time,
LV.update_time,
@@ -143,6 +149,7 @@
LV.play_num,
LV.collect_num,
LV.comment_num,
+ LV.thumbs_up_num,
LV.weight,
LV.audit_pass_time,
LV.update_time,
@@ -174,6 +181,7 @@
LV.play_num,
LV.collect_num,
LV.comment_num,
+ LV.thumbs_up_num,
LV.weight,
LV.audit_pass_time,
LV.update_time,
@@ -216,9 +224,11 @@
LV.play_num,
LV.comment_num,
LV.collect_num,
+ LV.thumbs_up_num,
LV.weight,
LV.audit_pass_time,
LV.update_time,
+ LV.create_time,
LV.video_content_type,
LV.video_type,
LV.video_imgs,
@@ -230,6 +240,76 @@
LEFT JOIN li_member LM ON LV.author_id = LM.id
WHERE
LV.delete_flag = 0 AND LV.status = '1' AND LV.video_type = #{query.videoType}
+ ORDER BY
+ LV.create_time DESC
+ </select>
+ <select id="recommendHealthVideo" resultMap="WxResultMap">
+ SELECT
+ LV.author_id,
+ LV.cover_url,
+ LV.video_fit,
+ LV.video_duration,
+ LV.video_file_key,
+ LV.title,
+ LV.goods_view_num,
+ LV.goods_order_num,
+ LV.recommend,
+ LV.status,
+ LV.play_num,
+ LV.comment_num,
+ LV.collect_num,
+ LV.thumbs_up_num,
+ LV.weight,
+ LV.audit_pass_time,
+ LV.update_time,
+ LV.video_content_type,
+ LV.video_type,
+ LV.video_imgs,
+ LV.id,
+ LAU.nick_name AS authorName,
+ LAU.avatar AS authorAvatar
+ FROM
+ lmk_video LV
+ LEFT JOIN li_admin_user LAU ON LV.author_id = LAU.id
+ WHERE
+ LV.delete_flag = 0 AND LV.status = '1' AND LV.video_type = #{query.videoType}
+ AND LV.video_content_type = 'video'
+ </select>
+
+ <select id="wxKitchenVideoQuery" resultMap="WxResultMap">
+ SELECT
+ LV.author_id,
+ LV.cover_url,
+ LV.video_fit,
+ LV.video_duration,
+ LV.video_file_key,
+ LV.title,
+ LV.goods_view_num,
+ LV.goods_order_num,
+ LV.recommend,
+ LV.status,
+ LV.play_num,
+ LV.comment_num,
+ LV.collect_num,
+ LV.thumbs_up_num,
+ LV.weight,
+ LV.audit_pass_time,
+ LV.update_time,
+ LV.video_content_type,
+ LV.video_type,
+ LV.video_imgs,
+ LV.id,
+ LAU.nick_name AS authorName,
+ LAU.avatar AS authorAvatar
+ FROM
+ lmk_video LV
+ LEFT JOIN li_admin_user LAU ON LV.author_id = LAU.id
+ <if test="query.kitchenTypeId !=null and query.kitchenTypeId !=''">
+ JOIN (SELECT DISTINCT video_id FROM lmk_kitchen_video_type_ref WHERE kitchen_type_id = #{query.kitchenTypeId}) VT ON VT.video_id = LV.id
+ </if>
+ WHERE
+ LV.delete_flag = 0 AND LV.status = '1' AND LV.video_type = #{query.videoType}
+ AND LV.video_content_type = 'video'
</select>
@@ -255,6 +335,20 @@
WHEN #{video.id} THEN #{video.countNum}
</foreach>
ELSE comment_num
+ END
+ WHERE id IN
+ <foreach collection="list" item="video" open="(" separator="," close=")">
+ #{video.id}
+ </foreach>
+ </update>
+
+ <update id="updateThumbsUpNumBatch">
+ UPDATE lmk_video
+ SET thumbs_up_num = CASE id
+ <foreach collection="list" item="video">
+ WHEN #{video.id} THEN #{video.countNum}
+ </foreach>
+ ELSE thumbs_up_num
END
WHERE id IN
<foreach collection="list" item="video" open="(" separator="," close=")">
@@ -307,6 +401,7 @@
LV.play_num,
LV.comment_num,
LV.collect_num,
+ LV.thumbs_up_num,
LV.weight,
LV.audit_pass_time,
LV.update_time,
@@ -345,6 +440,7 @@
LV.play_num,
LV.comment_num,
LV.collect_num,
+ LV.thumbs_up_num,
LV.weight,
LV.audit_pass_time,
LV.update_time,
@@ -364,18 +460,7 @@
LMC.create_time DESC
</select>
-
- <!-- 寰俊瑙嗛缂栬緫璇︽儏 -->
- <resultMap id="WxEditResultMap" type="cn.lili.modules.lmk.domain.vo.WxEditVideoVO">
- <id column="id" property="id"/>
- <result column="cover_url" property="coverFileKey" />
- <result column="video_file_key" property="videoFileKey" />
- <result column="video_fit" property="videoFit" />
- <result column="title" property="title" />
- <result column="video_duration" property="videoDuration" />
- </resultMap>
-
- <select id="wxDetail" resultMap="WxEditResultMap">
+ <select id="getAuthorLikeVideoPage" resultMap="WxResultMap">
SELECT
LV.author_id,
LV.cover_url,
@@ -390,11 +475,48 @@
LV.play_num,
LV.comment_num,
LV.collect_num,
+ LV.thumbs_up_num,
LV.weight,
LV.audit_pass_time,
LV.update_time,
LV.video_content_type,
LV.video_type,
+ LV.video_imgs,
+ LV.id,
+ LM.nick_name as authorName,
+ LM.face as authorAvatar
+ FROM
+ lmk_thumbs_up_record LMC
+ INNER JOIN lmk_video LV ON LMC.ref_id = LV.id AND LV.delete_flag = 0 AND LV.status = '1'
+ LEFT JOIN li_member LM ON LV.author_id = LM.id
+ WHERE
+ LMC.delete_flag = 0 AND LMC.user_id = #{query.authorId} AND LMC.thumbs_up_type = 'video' AND LV.video_type = #{query.videoType}
+ ORDER BY
+ LMC.create_time DESC
+ </select>
+
+
+ <!-- 寰俊瑙嗛缂栬緫璇︽儏 -->
+ <resultMap id="WxEditResultMap" type="cn.lili.modules.lmk.domain.vo.WxEditVideoVO">
+ <id column="id" property="id"/>
+ <result column="cover_url" property="coverFileKey" />
+ <result column="video_file_key" property="videoFileKey" />
+ <result column="video_fit" property="videoFit" />
+ <result column="title" property="title" />
+ <result column="video_duration" property="videoDuration" />
+ <result column="video_imgs" property="videoImgs" />
+ <result column="video_content_type" property="videoContentType" />
+ <collection property="goodsList" column="id" select="getVideoGoods" ofType="cn.lili.modules.lmk.domain.vo.VideoGoodsDetailVO"/>
+ </resultMap>
+
+ <select id="wxDetail" resultMap="WxEditResultMap">
+ SELECT
+ LV.cover_url,
+ LV.video_fit,
+ LV.video_duration,
+ LV.video_file_key,
+ LV.title,
+ LV.video_content_type,
LV.video_imgs,
LV.id
FROM
@@ -417,6 +539,7 @@
LV.play_num,
LV.collect_num,
LV.comment_num,
+ LV.thumbs_up_num,
LV.weight,
LV.audit_pass_time,
LV.update_time,
@@ -458,6 +581,7 @@
LV.play_num,
LV.collect_num,
LV.comment_num,
+ LV.thumbs_up_num,
LV.weight,
LV.audit_pass_time,
LV.update_time,
@@ -483,4 +607,69 @@
<if test="query.authorId != null and query.authorId != ''">AND LV.author_id = #{query.authorId}</if>
<if test="query.status != null and query.status != ''">AND LV.status = #{query.status}</if>
</select>
+
+ <resultMap id="EsResultMap" type="cn.lili.modules.lmk.domain.es.VideoIndex">
+ <id column="id" property="id"/>
+ <result column="author_id" property="authorId" />
+ <result column="authorName" property="authorName" />
+ <result column="authorAvatar" property="authorAvatar" />
+ <result column="cover_url" property="coverFileKey" />
+ <result column="video_file_key" property="videoFileKey" />
+ <result column="video_fit" property="videoFit" />
+ <result column="video_duration" property="videoDuration" />
+ <result column="title" property="title" />
+ <result column="status" property="status" />
+ <result column="recommend" property="recommend" />
+ <result column="video_content_type" property="videoContentType" />
+ <result column="video_type" property="videoType" />
+ <result column="video_imgs" property="videoImgs" />
+ <collection property="goodsList" column="id" select="getVideoGoods" ofType="cn.lili.modules.lmk.domain.vo.VideoGoodsDetailVO"/>
+ <collection property="tagList" column="id" select="getVideoTags" ofType="cn.lili.modules.lmk.domain.vo.SimpleVideoTagVO"/>
+ </resultMap>
+
+ <select id="getVideoTags" resultType="cn.lili.modules.lmk.domain.vo.SimpleVideoTagVO">
+ SELECT
+ LVT.id,
+ LVT.tag_name as tagName
+ FROM
+ lmk_video_tag_ref LVTR
+ INNER JOIN lmk_video_tag LVT ON LVTR.video_tag_id = LVT.id AND LVT.delete_flag = 0
+ WHERE
+ LVTR.video_id = #{id}
+ </select>
+
+ <select id="getEsPage" parameterType="int" resultMap="EsResultMap">
+ SELECT
+ LV.author_id,
+ LV.cover_url,
+ LV.video_fit,
+ LV.video_duration,
+ LV.video_file_key,
+ LV.title,
+ LV.goods_view_num,
+ LV.goods_order_num,
+ LV.recommend,
+ LV.status,
+ LV.play_num,
+ LV.comment_num,
+ LV.collect_num,
+ LV.thumbs_up_num,
+ LV.weight,
+ LV.audit_pass_time,
+ LV.update_time,
+ LV.create_time,
+ LV.video_content_type,
+ LV.video_type,
+ LV.video_imgs,
+ LV.id,
+ LM.nick_name as authorName,
+ LM.face as authorAvatar
+ FROM
+ lmk_video LV
+ LEFT JOIN li_member LM ON LV.author_id = LM.id
+ WHERE
+ LV.delete_flag = 0
+ LIMIT #{start}, #{pageSize}
+ </select>
+
</mapper>
--
Gitblit v1.8.0