From 6d95ff17f7d0de0b3efafe033ba1e3b4487d4f2e Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期二, 05 八月 2025 09:14:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
framework/src/main/java/cn/lili/modules/lmk/service/impl/VideoServiceImpl.java | 74 +++++++++++++++++++++++++++++++-----
1 files changed, 63 insertions(+), 11 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 0679ce2..6d4fea0 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
@@ -565,15 +565,16 @@
case "recommend":// 鍔犺浇鎺ㄨ崘瑙嗛
baseMapper.recommendVideo(page, query);
//鎺ㄨ崘瑙嗛閲嶆柊鎺掑簭
- WxVideoVO wxVideoVO = null;
- if (StringUtils.isNotBlank(query.getVideoId())) {
- wxVideoVO = baseMapper.recommendVideoByVideoId(query);
- }
- List<WxVideoVO> records = page.getRecords();
- Collections.shuffle(records);
- if (wxVideoVO!=null) {
- records.set(0, wxVideoVO);
- }
+ buildRecommendVideoList(page, query.getVideoId());
+// WxVideoVO wxVideoVO = null;
+// if (StringUtils.isNotBlank(query.getVideoId())) {
+// wxVideoVO = baseMapper.recommendVideoByVideoId(query);
+// }
+// List<WxVideoVO> records = page.getRecords();
+// Collections.shuffle(records);
+// if (wxVideoVO!=null) {
+// records.set(0, wxVideoVO);
+// }
break;
case "author": // 鍔犺浇瑙嗛涓婚〉鎴戝彂甯冪殑瑙嗛
AuthorVideoQuery query1 = new AuthorVideoQuery();
@@ -709,7 +710,10 @@
public Result healthRecommendVideo(WxHealthVideoQuery query) {
IPage<WxVideoVO> page = PageUtil.getPage(query, WxVideoVO.class);
//鑾峰彇澶у仴搴疯棰戝垪琛�
+
baseMapper.recommendHealthVideo(page,query);
+ buildRecommendVideoList(page, query.getVideoId());
+
if (page.getTotal() > 0) {
page.getRecords().forEach(v -> {
v.setAuthorAvatar(cosUtil.getPreviewUrl(v.getAuthorAvatar()));
@@ -733,8 +737,11 @@
@Override
public Result kitchenRecommendVideo(WxKitchenVideoQuery query) {
IPage<WxVideoVO> page = PageUtil.getPage(query, WxVideoVO.class);
- baseMapper.wxKitchenVideoQuery(page, query);
- page.getRecords().forEach(v -> {
+ baseMapper.wxKitchenVideoQuery(page, query);
+
+ buildRecommendVideoList(page, query.getVideoId());
+
+ page.getRecords().forEach(v -> {
v.setAuthorAvatar(cosUtil.getPreviewUrl(v.getAuthorAvatar()));
if (VideoContentTypeEnum.VIDEO.getValue().equals(v.getVideoContentType())) {
v.setVideoUrl(cosUtil.getPreviewUrl(v.getVideoFileKey()));
@@ -744,6 +751,51 @@
return Result.ok().data(page.getRecords()).total(page.getTotal());
}
+ /**
+ *
+ * @param page
+ * @param videoId videoId鎺ㄨ崘鐨勮棰慽d
+ */
+ private void buildRecommendVideoList(IPage<WxVideoVO> page, String videoId) {
+ //鏌ヨ鍒版湁瑙嗛鍒楄〃
+
+ if(org.apache.commons.collections.CollectionUtils.isNotEmpty(page.getRecords())){
+ //鐜板皢瑙嗛椤哄簭鎵撲贡
+ Collections.shuffle(page.getRecords());
+
+ WxVideoVO wxVideoVO = null;
+ if (StringUtils.isNotBlank(videoId)){
+ VideoQuery videoQuery = new VideoQuery();
+ videoQuery.setVideoId(videoId);
+ wxVideoVO = baseMapper.recommendVideoByVideoId(videoQuery);
+
+ boolean found = false;
+ int foundIndex = -1;
+
+ List<WxVideoVO> records = page.getRecords();
+ //鍒ゆ柇浜岀淮鐮佽繃鏉ョ殑videoId鏄惁瀛樺湪涓巔age.getRecords閲嶅 璁板綍涓嬫爣
+ for (int i = 0; i < records.size(); i++) {
+ if (wxVideoVO.getId().equals(records.get(i).getId())) {
+ found = true;
+ foundIndex = i;
+ break;
+ }
+ }
+ if (found){
+ WxVideoVO matchedRecord = records.remove(foundIndex);
+ records.add(0, matchedRecord);
+ }else {
+ // 濡傛灉娌℃壘鍒帮紝鏇挎崲棣栦綅
+ records.set(0, wxVideoVO);
+
+ }
+
+
+ }
+ }
+
+ }
+
@Override
@Transactional(rollbackFor = Exception.class)
public void updateCollectNumBatch(List<CollectTypeNumVO> numList) {
--
Gitblit v1.8.0