From d4d9ea89dd109cb975eaa3412a15c5ff6e8d11dd Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期三, 02 七月 2025 18:58:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
framework/src/main/java/cn/lili/modules/lmk/service/impl/VideoServiceImpl.java | 138 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 134 insertions(+), 4 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 cdfff28..ad439e9 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
@@ -18,6 +18,7 @@
import cn.lili.modules.member.entity.dos.Member;
import cn.lili.modules.member.service.FootprintService;
import cn.lili.modules.member.service.MemberService;
+import cn.lili.modules.search.entity.dos.EsGoodsIndex;
import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
import cn.lili.rocketmq.tags.CommentTagsEnum;
import cn.lili.rocketmq.tags.VideoTagsEnum;
@@ -33,8 +34,18 @@
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.ListUtils;
import org.apache.commons.lang3.StringUtils;
+import org.apache.lucene.search.join.ScoreMode;
import org.apache.rocketmq.spring.core.RocketMQTemplate;
+import org.elasticsearch.index.query.*;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
+import org.springframework.data.elasticsearch.core.SearchHits;
+import org.springframework.data.elasticsearch.core.query.NativeSearchQuery;
+import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
import org.springframework.stereotype.Service;
import lombok.RequiredArgsConstructor;
import cn.lili.utils.PageUtil;
@@ -74,6 +85,10 @@
private final RocketmqCustomProperties rocketmqCustomProperties;
private final RocketMQTemplate rocketMQTemplate;
private final ThumbsUpRecordService thumbsUpRecordService;
+ private final ElasticsearchOperations restTemplate;
+
+ @Qualifier("videoEsServiceImpl")
+ private final EsService esService;
/**
@@ -219,6 +234,8 @@
// 5. 鏋勫缓es涓暟鎹紝mq寮傛澶勭悊
VideoIndex videoIndex = new VideoIndex();
BeanUtils.copyProperties(video, videoIndex);
+ videoIndex.setAuthorName(UserContext.getCurrentUser().getNickName());
+ videoIndex.setAuthorAvatar(UserContext.getCurrentUser().getFace());
videoIndex.setCoverFileKey(video.getCoverUrl());
List<VideoGoodsDetailVO> esGoodsList = videoGoods.stream().map(goods -> {
VideoGoodsDetailVO vo = new VideoGoodsDetailVO();
@@ -302,6 +319,8 @@
// 5. 鏇存柊es涓殑鏁版嵁锛宮q寮傛澶勭悊
VideoIndex videoIndex = new VideoIndex();
BeanUtils.copyProperties(video, videoIndex);
+ videoIndex.setAuthorName(UserContext.getCurrentUser().getNickName());
+ videoIndex.setAuthorAvatar(UserContext.getCurrentUser().getFace());
videoIndex.setCoverFileKey(video.getCoverUrl());
List<VideoGoodsDetailVO> esGoodsList = videoGoods.stream().map(goods -> {
VideoGoodsDetailVO vo = new VideoGoodsDetailVO();
@@ -451,23 +470,33 @@
// 鎺ㄨ崘绠楁硶锛� 1. 鏍规嵁鐢ㄦ埛鐨勬敹钘忚棰戠殑鏍囩 2. 鏍规嵁鐢ㄦ埛鍏虫敞鐨勪綔鑰呯殑鍏跺畠瑙嗛 3. 鏍规嵁鐢ㄦ埛鐨勮鐪嬭褰曪紙瑙傜湅鏃堕暱杈冮暱鐨勩�侀噸澶嶈鐪嬫鏁拌緝澶氱殑锛� 4. 鍩轰簬鐩镐技鐢ㄦ埛鐨勮鐪嬭涓烘潵缁欒鐢ㄦ埛鎺ㄨ崘
IPage<WxVideoVO> page = PageUtil.getPage(query, WxVideoVO.class);
switch (query.getVideoFrom()) {
- case "recommend":
+ case "recommend":// 鍔犺浇鎺ㄨ崘瑙嗛
baseMapper.recommendVideo(page, query);
break;
- case "author":
+ case "author": // 鍔犺浇瑙嗛涓婚〉鎴戝彂甯冪殑瑙嗛
AuthorVideoQuery query1 = new AuthorVideoQuery();
+ BeanUtils.copyProperties(query, query1);
query1.setAuthorId(query.getAuthorId());
baseMapper.getAuthorVideoPage(page, query1);
break;
- case "collect":
+ case "collect": // 鍔犺浇瑙嗛涓婚〉鏀惰棌瑙嗛
AuthorVideoQuery query2 = new AuthorVideoQuery();
+ BeanUtils.copyProperties(query, query2);
query2.setAuthorId(query.getAuthorId());
baseMapper.getAuthorCollectVideoPage(page, query2);
break;
- case "like":
+ case "like": // 鍔犺浇瑙嗛涓婚〉鐐硅禐瑙嗛
AuthorVideoQuery query3 = new AuthorVideoQuery();
+ BeanUtils.copyProperties(query, query3);
query3.setAuthorId(query.getAuthorId());
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);
default:
break;
}
@@ -607,6 +636,12 @@
.in(Video::getId, chunk.stream().map(CollectTypeNumVO::getId).collect(Collectors.toList()))
.set(Video::getCollectNumJob, Boolean.FALSE)
.update();
+ // 鏇存柊es鐨勬敹钘忔暟
+ for (CollectTypeNumVO vo : chunk) {
+ Map<String, Object> fields = new HashMap<>(1);
+ fields.put("collectNum", vo.getCountNum());
+ esService.updateSomeField(EsSuffix.VIDEO_INDEX_NAME, vo.getId(), fields);
+ }
}
}
@@ -621,6 +656,12 @@
.in(Video::getId, chunk.stream().map(CollectTypeNumVO::getId).collect(Collectors.toList()))
.set(Video::getCommentNumJob, Boolean.FALSE)
.update();
+ // 鏇存柊es鐨勮瘎璁烘暟
+ for (CollectTypeNumVO vo : chunk) {
+ Map<String, Object> fields = new HashMap<>(1);
+ fields.put("commentNum", vo.getCountNum());
+ esService.updateSomeField(EsSuffix.VIDEO_INDEX_NAME, vo.getId(), fields);
+ }
}
}
@@ -1078,6 +1119,95 @@
.in(Video::getId, chunk.stream().map(CollectTypeNumVO::getId).collect(Collectors.toList()))
.set(Video::getThumbsUpNumJob, Boolean.FALSE)
.update();
+ // 鏇存柊es鐨勭偣璧炴暟
+ for (CollectTypeNumVO vo : chunk) {
+ Map<String, Object> fields = new HashMap<>(1);
+ fields.put("thumbsUpNum", vo.getCountNum());
+ esService.updateSomeField(EsSuffix.VIDEO_INDEX_NAME, vo.getId(), fields);
+ }
}
}
+
+ @Override
+ public Result esSearch(VideoEsQuery q) {
+ // 鍒ゆ柇鍟嗗搧绱㈠紩鏄惁瀛樺湪
+ if (!restTemplate.indexOps(VideoIndex.class).exists()) {
+ return Result.ok();
+ }
+ q.setPageNumber(q.getPageNumber() - 1); // 鍓嶇淇濇寔缁熶竴浠庣涓�椤靛紑濮嬶紝浣嗘槸es浠�0椤靛紑濮嬶紝鎵�浠ュ噺涓�
+ // 鏍规嵁鐐硅禐鏁版帓搴�
+ Pageable pageable = PageRequest.of(q.getPageNumber(), q.getPageSize(), Sort.by(Sort.Direction.DESC, "thumbsUpNum"));
+
+ NativeSearchQueryBuilder queryBuilder = new NativeSearchQueryBuilder();
+ queryBuilder.withPageable(pageable);
+
+ if (StringUtils.isNotBlank(q.getKeyword())) {
+ // 1. 鏋勫缓涓诲竷灏旀煡璇�
+ BoolQueryBuilder boolQuery = QueryBuilders.boolQuery();
+
+ // 2. 娣诲姞鏍囬鍖归厤锛堥潪宓屽瀛楁锛�
+ boolQuery.should(QueryBuilders.matchQuery("title", q.getKeyword()));
+
+ // 3. 娣诲姞宓屽鏍囩鍖归厤
+ NestedQueryBuilder tagQuery = QueryBuilders.nestedQuery(
+ "tagList",
+ QueryBuilders.matchQuery("tagList.tagName", q.getKeyword()),
+ ScoreMode.Total // 浣跨敤鎬诲垎妯″紡
+ );
+ boolQuery.should(tagQuery);
+
+ // 4. 娣诲姞宓屽鍟嗗搧鍖归厤
+ NestedQueryBuilder goodsQuery = QueryBuilders.nestedQuery(
+ "goodsList",
+ QueryBuilders.matchQuery("goodsList.goodsName", q.getKeyword()),
+ ScoreMode.Total
+ );
+ boolQuery.should(goodsQuery);
+
+ // 5. 璁剧疆鑷冲皯鍖归厤涓�涓潯浠讹紙OR閫昏緫锛�
+ boolQuery.minimumShouldMatch(1);
+
+ // 6. 鐘舵�佷负宸插彂甯冪殑
+ boolQuery.must(QueryBuilders.termQuery("status", VideoStatusEnum.PUBLISHED.getValue()));
+ queryBuilder.withQuery(boolQuery);
+ } else {
+ return Result.ok().data(new ArrayList<>()).total(0);
+ }
+ NativeSearchQuery query = queryBuilder.build();
+ SearchHits<VideoIndex> searchHits = restTemplate.search(query, VideoIndex.class);
+ if (CollectionUtils.isEmpty(searchHits.getSearchHits())) {
+ return Result.ok().data(new ArrayList<>()).total(0);
+ }
+ List<VideoIndex> data = searchHits.stream().map(hit -> hit.getContent()).collect(Collectors.toList());
+ List<String> videoIds = data.stream().map(VideoIndex::getId).collect(Collectors.toList());
+ // 瀵硅薄杞崲
+ 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());
+ List<WxVideoVO> vos = data.stream().map(videoIndex -> {
+ WxVideoVO wxVideoVO = new WxVideoVO();
+ BeanUtils.copyProperties(videoIndex, wxVideoVO);
+ // 鍒ゆ柇鏄惁鍏虫敞浣滆�呫�佹槸鍚︾偣璧炪�佹槸鍚︽敹钘�
+ wxVideoVO.setCollected(CollectionUtils.isNotEmpty(collectMap.get(wxVideoVO.getId())));
+ wxVideoVO.setThumbsUp(CollectionUtils.isNotEmpty(thumbsUpMap.get(wxVideoVO.getId())));
+ if (UserContext.getCurrentUserId().equals(wxVideoVO.getAuthorId())) {
+ wxVideoVO.setSubscribeThisAuthor(Boolean.TRUE);
+ } else {
+ wxVideoVO.setSubscribeThisAuthor(subscribes.contains(wxVideoVO.getAuthorId()));
+ }
+ if (VideoContentTypeEnum.VIDEO.getValue().equals(wxVideoVO.getVideoContentType())) {
+ wxVideoVO.setCoverUrl(cosUtil.getPreviewUrl(wxVideoVO.getCoverFileKey()));
+ wxVideoVO.setVideoUrl(cosUtil.getPreviewUrl(wxVideoVO.getVideoFileKey()));
+ } else if (VideoContentTypeEnum.IMG.getValue().equals(wxVideoVO.getVideoContentType()) && StringUtils.isNotBlank(wxVideoVO.getVideoImgs())) {
+ wxVideoVO.setImgs(JSON.parseArray(wxVideoVO.getVideoImgs(), String.class).stream().map(fileKey -> cosUtil.getPreviewUrl(fileKey)).collect(Collectors.toList()));
+ wxVideoVO.setCoverUrl(wxVideoVO.getImgs().get(0));
+ }
+ return wxVideoVO;
+ }).collect(Collectors.toList());
+ return Result.ok().data(vos).total(searchHits.getTotalHits());
+ }
}
--
Gitblit v1.8.0