From 9fe0aefb466a87815ef450cb4ef99405dad63b4e Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期一, 17 十一月 2025 11:49:11 +0800
Subject: [PATCH] 中奖用户打* 解决首页视频显示不全问题
---
framework/src/main/java/cn/lili/modules/lmk/service/impl/VideoServiceImpl.java | 555 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 524 insertions(+), 31 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..5f525a8 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
@@ -4,6 +4,7 @@
import cn.lili.cache.CachePrefix;
import cn.lili.common.properties.RocketmqCustomProperties;
import cn.lili.common.security.context.UserContext;
+import cn.lili.common.utils.CommonUtil;
import cn.lili.elasticsearch.EsSuffix;
import cn.lili.modules.lmk.constant.RedisKeyExpireConstant;
import cn.lili.modules.lmk.domain.dto.VideoEsUpdateDTO;
@@ -18,10 +19,14 @@
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.permission.entity.dos.AdminUser;
+import cn.lili.modules.permission.service.AdminUserService;
+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;
import cn.lili.utils.COSUtil;
+import cn.lili.utils.TencentCdnUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.metadata.IPage;
import cn.lili.modules.lmk.mapper.VideoMapper;
@@ -33,8 +38,19 @@
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.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import lombok.RequiredArgsConstructor;
import cn.lili.utils.PageUtil;
@@ -43,6 +59,8 @@
import org.springframework.util.Assert;
import java.util.*;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
import java.util.stream.Collectors;
/**
@@ -70,14 +88,20 @@
private final VideoGoodsService videoGoodsService;
private final KitchenTypeService kitchenTypeService;
private final Cache cache;
-
+ private final AdminUserService adminUserService;
private final RocketmqCustomProperties rocketmqCustomProperties;
private final RocketMQTemplate rocketMQTemplate;
private final ThumbsUpRecordService thumbsUpRecordService;
+ private final ElasticsearchOperations restTemplate;
+ private final TencentCdnUtil cdnUtil;
+
+ @Qualifier("videoEsServiceImpl")
+ private final EsService esService;
/**
* 鎵归噺鍒犻櫎
+ *
* @param ids
* @return
*/
@@ -89,6 +113,7 @@
/**
* id鍒犻櫎
+ *
* @param id
* @return
*/
@@ -110,6 +135,7 @@
/**
* 鍒嗛〉鏌ヨ
+ *
* @param query
* @return
*/
@@ -122,6 +148,7 @@
/**
* 鏍规嵁id鏌ユ壘
+ *
* @param id
* @return
*/
@@ -146,6 +173,7 @@
/**
* 鍒楄〃
+ *
* @return
*/
@Override
@@ -219,6 +247,85 @@
// 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();
+ BeanUtils.copyProperties(goods, vo);
+ return vo;
+ }).collect(Collectors.toList());
+ videoIndex.setGoodsList(esGoodsList);
+ videoIndex.setTagList(esTagList);
+ String destination = rocketmqCustomProperties.getVideoTopic() + ":" + VideoTagsEnum.ES_DOC_ADD_OR_UPDATE.name();
+ rocketMQTemplate.asyncSend(destination, JSON.toJSONString(videoIndex), RocketmqSendCallbackBuilder.commonCallback());
+ return Result.ok("鍙戝竷鎴愬姛锛岃棰戝鏍镐腑~");
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Result systemPublish(WxVideoForm form) {
+ // 1.淇濆瓨瑙嗛
+ Video video = WxVideoForm.getEntityByForm(form, null);
+ video.setAuthorId(UserContext.getCurrentUserId());
+ video.setStatus(VideoStatusEnum.PUBLISHED.getValue());
+ video.setCoverUrl(form.getCover());
+ video.setVideoType(VideoTypeEnum.VIDEO.getValue());
+ video.setRecommend(Boolean.FALSE);
+ if (VideoContentTypeEnum.IMG.getValue().equals(form.getVideoContentType())) {
+ video.setVideoImgs(JSON.toJSONString(form.getVideoImgs()));
+ }
+ baseMapper.insert(video);
+ // 2.澶勭悊鏍囩
+ List<SimpleVideoTagVO> esTagList = new ArrayList<>(2);
+ List<VideoTagRef> videoTagRefs = form.getTags().stream().map(tag -> {
+ VideoTagRef videoTagRef = new VideoTagRef();
+ videoTagRef.setVideoId(video.getId());
+ if (StringUtils.isBlank(tag.getId())) {
+ VideoTag videoTag = new LambdaQueryChainWrapper<>(videoTagService.getBaseMapper())
+ .eq(VideoTag::getTagName, tag.getTagName())
+ .one();
+ if (Objects.nonNull(videoTag)) {
+ videoTagRef.setVideoTagId(videoTag.getId());
+ } else {
+ videoTag = new VideoTag();
+ videoTag.setTagName(tag.getTagName());
+ videoTag.setCreateType(TagCreateTypeEnum.SYSTEM.getValue());
+ videoTagService.save(videoTag);
+ videoTagRef.setVideoTagId(videoTag.getId());
+ }
+ } else {
+ videoTagRef.setVideoTagId(tag.getId());
+ }
+ SimpleVideoTagVO esTag = new SimpleVideoTagVO();
+ esTag.setVideoId(video.getId());
+ esTag.setTagName(tag.getTagName());
+ esTag.setId(tag.getId());
+ esTagList.add(esTag);
+ return videoTagRef;
+ }).collect(Collectors.toList());
+ videoTagRefService.saveBatch(videoTagRefs);
+ // 3. 淇濆瓨瑙嗛鏂囦欢淇℃伅
+ lmkFileService.addByForm(form.getFileInfo());
+ // 4. 澶勭悊閫夋嫨鐨勫晢鍝�
+ List<VideoGoods> videoGoods = new ArrayList<>(2);
+ if (CollectionUtils.isNotEmpty(form.getGoodsList())) {
+ for (int i = 0; i < form.getGoodsList().size(); i++) {
+ VideoGoods e = new VideoGoods();
+ e.setVideoId(video.getId());
+ e.setGoodsId(form.getGoodsList().get(i).getGoodsId());
+ e.setGoodsSkuId(form.getGoodsList().get(i).getGoodsSkuId());
+ e.setGoodsNum(form.getGoodsList().get(i).getGoodsNum());
+ e.setOrderNum(i);
+ videoGoodsService.save(e);
+ }
+ videoGoodsService.saveBatch(videoGoods);
+ }
+ // 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 +409,106 @@
// 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();
+ BeanUtils.copyProperties(goods, vo);
+ return vo;
+ }).collect(Collectors.toList());
+ videoIndex.setGoodsList(esGoodsList);
+ videoIndex.setTagList(esTagList);
+ String destination = rocketmqCustomProperties.getVideoTopic() + ":" + VideoTagsEnum.ES_DOC_ADD_OR_UPDATE.name();
+ rocketMQTemplate.asyncSend(destination, JSON.toJSONString(videoIndex), RocketmqSendCallbackBuilder.commonCallback());
+ return Result.ok("鍙戝竷鎴愬姛锛岃棰戝鏍镐腑~");
+ }
+
+ @Override
+ public Result sysUpdatePublish(WxVideoForm form) {
+ Video video = baseMapper.selectById(form.getId());
+ if (Objects.isNull(video)) {
+ return Result.error("淇敼瑙嗛涓嶅瓨鍦�");
+ }
+ // 1.淇敼瑙嗛
+ WxVideoForm.getEntityByForm(form, video);
+ 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.updateById(video);
+ // 2.澶勭悊鏍囩---鍒犻櫎涔嬪墠鐨勮棰戞爣绛惧叧绯伙紝鍐嶆柊澧�
+ new LambdaUpdateChainWrapper<>(videoTagRefService.getBaseMapper())
+ .eq(VideoTagRef::getVideoId, video.getId())
+ .remove();
+ List<SimpleVideoTagVO> esTagList = new ArrayList<>(2);
+ List<VideoTagRef> videoTagRefs = form.getTags().stream().map(tag -> {
+ VideoTagRef videoTagRef = new VideoTagRef();
+ videoTagRef.setVideoId(video.getId());
+ if (StringUtils.isBlank(tag.getId())) {
+ VideoTag videoTag = new LambdaQueryChainWrapper<>(videoTagService.getBaseMapper())
+ .eq(VideoTag::getTagName, tag.getTagName())
+ .one();
+ if (Objects.nonNull(videoTag)) {
+ videoTagRef.setVideoTagId(videoTag.getId());
+ } else {
+ videoTag = new VideoTag();
+ videoTag.setTagName(tag.getTagName());
+ videoTag.setCreateType(TagCreateTypeEnum.USER.getValue());
+ videoTagService.save(videoTag);
+ videoTagRef.setVideoTagId(videoTag.getId());
+ }
+ } else {
+ videoTagRef.setVideoTagId(tag.getId());
+ }
+ SimpleVideoTagVO esTag = new SimpleVideoTagVO();
+ esTag.setVideoId(video.getId());
+ esTag.setTagName(tag.getTagName());
+ esTag.setId(tag.getId());
+ esTagList.add(esTag);
+ return videoTagRef;
+ }).collect(Collectors.toList());
+ videoTagRefService.saveBatch(videoTagRefs);
+ // 3. 淇濆瓨瑙嗛鏂囦欢淇℃伅
+ lmkFileService.addByForm(form.getFileInfo());
+ // 4. 澶勭悊閫夋嫨鐨勫晢鍝侊紝鍏堝垹闄や箣鍓嶇殑鍐嶆柊澧�
+ new LambdaUpdateChainWrapper<>(videoGoodsService.getBaseMapper())
+ .eq(VideoGoods::getVideoId, video.getId())
+ .remove();
+ List<VideoGoods> videoGoods = new ArrayList<>(2);
+ if (CollectionUtils.isNotEmpty(form.getGoodsList())) {
+ for (int i = 0; i < form.getGoodsList().size(); i++) {
+ VideoGoods e = new VideoGoods();
+ e.setVideoId(video.getId());
+ e.setGoodsId(form.getGoodsList().get(i).getGoodsId());
+ e.setGoodsSkuId(form.getGoodsList().get(i).getGoodsSkuId());
+ e.setGoodsNum(form.getGoodsList().get(i).getGoodsNum());
+ e.setOrderNum(i);
+ videoGoods.add(e);
+ }
+ videoGoodsService.saveBatch(videoGoods);
+ }
+ // 5. 鏇存柊es涓殑鏁版嵁锛宮q寮傛澶勭悊
+ VideoIndex videoIndex = new VideoIndex();
+ BeanUtils.copyProperties(video, videoIndex);
+ String avatar = "";
+ String name = "";
+ //璁剧疆鐢ㄦ埛淇℃伅澶村儚
+ VideoUserBaseInfo videoSysUserBaseInfo = baseMapper.getVideoSysUserBaseInfo(video.getAuthorId());
+
+ if (videoSysUserBaseInfo != null) {
+ avatar = videoSysUserBaseInfo.getAvatar();
+ name = videoSysUserBaseInfo.getNickName();
+ }
+ VideoUserBaseInfo videoMemUserBaseInfo = baseMapper.getVideoMemUserBaseInfo(video.getAuthorId());
+ if (videoMemUserBaseInfo != null) {
+ avatar = videoMemUserBaseInfo.getAvatar();
+ name = videoMemUserBaseInfo.getNickName();
+ }
+ videoIndex.setAuthorName(name);
+ videoIndex.setAuthorAvatar(avatar);
videoIndex.setCoverFileKey(video.getCoverUrl());
List<VideoGoodsDetailVO> esGoodsList = videoGoods.stream().map(goods -> {
VideoGoodsDetailVO vo = new VideoGoodsDetailVO();
@@ -328,7 +535,16 @@
// 3. 鑾峰彇瑙嗛涓存椂璁块棶鍦板潃銆佽缃棰戞爣绛�
page.getRecords().forEach(v -> {
v.setTagList(tagMap.get(v.getId()));
- v.setCoverUrl(cosUtil.getPreviewUrl(v.getCoverUrl()));
+ String coverUrl = v.getCoverUrl();
+ if (StringUtils.isNotBlank(coverUrl) && !coverUrl.contains("http")) {
+ v.setCoverUrl(cosUtil.getPreviewUrl(v.getCoverUrl()));
+ }
+ v.getGoodsList().forEach(goods -> {
+ if (StringUtils.isNotBlank(goods.getThumbnail()) && !goods.getThumbnail().contains("http")) {
+ goods.setThumbnail(cosUtil.getPreviewUrl(goods.getThumbnail()));
+ }
+
+ });
});
}
return Result.ok().data(page.getRecords()).total(page.getTotal());
@@ -374,6 +590,9 @@
video.setAuditPassTime(new Date());
fields.put("status", VideoStatusEnum.PUBLISHED.getValue());
+
+ // 璋僣dn棰勭儹
+ cdnUtil.pushUrlsCache(new String[]{video.getCoverUrl(), video.getVideoFileKey()});
} else {
video.setStatus(VideoStatusEnum.REJECT.getValue());
fields.put("status", VideoStatusEnum.REJECT.getValue());
@@ -386,6 +605,7 @@
dto.setFields(fields);
String destination = rocketmqCustomProperties.getVideoTopic() + ":" + VideoTagsEnum.ES_DOC_UPDATE_SOME_FIELD.name();
rocketMQTemplate.asyncSend(destination, JSON.toJSONString(dto), RocketmqSendCallbackBuilder.commonCallback());
+
return Result.ok();
}
@@ -451,23 +671,55 @@
// 鎺ㄨ崘绠楁硶锛� 1. 鏍规嵁鐢ㄦ埛鐨勬敹钘忚棰戠殑鏍囩 2. 鏍规嵁鐢ㄦ埛鍏虫敞鐨勪綔鑰呯殑鍏跺畠瑙嗛 3. 鏍规嵁鐢ㄦ埛鐨勮鐪嬭褰曪紙瑙傜湅鏃堕暱杈冮暱鐨勩�侀噸澶嶈鐪嬫鏁拌緝澶氱殑锛� 4. 鍩轰簬鐩镐技鐢ㄦ埛鐨勮鐪嬭涓烘潵缁欒鐢ㄦ埛鎺ㄨ崘
IPage<WxVideoVO> page = PageUtil.getPage(query, WxVideoVO.class);
switch (query.getVideoFrom()) {
- case "recommend":
+ case "recommend":// 鍔犺浇鎺ㄨ崘瑙嗛
baseMapper.recommendVideo(page, query);
+ //鎺ㄨ崘瑙嗛閲嶆柊鎺掑簭
+ 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":
+ 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 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;
}
@@ -491,11 +743,21 @@
v.setCommentNum(this.getCommentNum(v.getId(), v.getCommentNum()));
v.setCollectNum(this.getCollectNum(v.getId(), v.getCollectNum()));
v.setThumbsUpNum(this.getThumbsUpNum(v.getId(), v.getThumbsUpNum()));
+ String authorAvatar = v.getAuthorAvatar();
+ if (StringUtils.isNotBlank(authorAvatar) && !authorAvatar.contains("http")) {
+ 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()));
+
+ String coverFileKey = v.getCoverFileKey();
+ if (StringUtils.isNotBlank(coverFileKey) && !coverFileKey.contains("http")) {
+ v.setCoverUrl(cosUtil.getPreviewUrl(coverFileKey));
+ }
+
} 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.setVideoUrl("");
}
if (CollectionUtils.isNotEmpty(v.getGoodsList())) {
v.getGoodsList().stream().forEach(goods -> {
@@ -515,7 +777,7 @@
* @param mysqlNum
* @return
*/
- private Integer getCommentNum(String videoId, Integer mysqlNum) {
+ public Integer getCommentNum(String videoId, Integer mysqlNum) {
Object redisNum = cache.get(CachePrefix.VIDEO_COMMENT_NUM.getPrefixWithId(videoId));
if (Objects.isNull(redisNum)) {
// redis涓病鏈夊氨鎶婃暟鎹簱鐨勫啓鍒皉edis涓�
@@ -532,7 +794,7 @@
* @param mysqlNum
* @return
*/
- private Integer getCollectNum(String videoId, Integer mysqlNum) {
+ public Integer getCollectNum(String videoId, Integer mysqlNum) {
Object redisNum = cache.get(CachePrefix.VIDEO_COLLECT_NUM.getPrefixWithId(videoId));
if (Objects.isNull(redisNum)) {
// redis涓病鏈夊氨鎶婃暟鎹簱鐨勫啓鍒皉edis涓�
@@ -549,7 +811,7 @@
* @param mysqlNum
* @return
*/
- private Integer getThumbsUpNum(String videoId, Integer mysqlNum) {
+ public Integer getThumbsUpNum(String videoId, Integer mysqlNum) {
Object redisNum = cache.get(CachePrefix.VIDEO_THUMBS_UP_NUM.getPrefixWithId(videoId));
if (Objects.isNull(redisNum)) {
// redis涓病鏈夊氨鎶婃暟鎹簱鐨勫啓鍒皉edis涓�
@@ -563,9 +825,13 @@
public Result healthRecommendVideo(WxHealthVideoQuery query) {
IPage<WxVideoVO> page = PageUtil.getPage(query, WxVideoVO.class);
//鑾峰彇澶у仴搴疯棰戝垪琛�
- baseMapper.recommendHealthVideo(page,query);
+
+ baseMapper.recommendHealthVideo(page, query);
+ buildRecommendVideoList(page, query.getVideoId());
+
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()));
@@ -586,14 +852,62 @@
@Override
public Result kitchenRecommendVideo(WxKitchenVideoQuery query) {
IPage<WxVideoVO> page = PageUtil.getPage(query, WxVideoVO.class);
- baseMapper.wxKitchenVideoQuery(page, query);
- page.getRecords().forEach(v -> {
- if (VideoContentTypeEnum.VIDEO.getValue().equals(v.getVideoContentType())) {
- v.setVideoUrl(cosUtil.getPreviewUrl(v.getVideoFileKey()));
- v.setCoverUrl(cosUtil.getPreviewUrl(v.getCoverFileKey()));
- }
- });
+ 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()));
+ v.setCoverUrl(cosUtil.getPreviewUrl(v.getCoverFileKey()));
+ }
+ });
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
@@ -607,6 +921,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,24 +941,47 @@
.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);
+ }
}
}
@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();
}
@Override
public Result getAuthorInfo(String authorId) {
- VideoAccountVO vo = baseMapper.getAuthorInfo(authorId, UserContext.getCurrentUserId());
+ AdminUser adminUser = adminUserService.getById(authorId);
+ VideoAccountVO vo;
+ if (Objects.isNull(adminUser)) {
+ vo = baseMapper.getAuthorInfo(authorId, UserContext.getCurrentUserId());
+ } else {
+ vo = baseMapper.getAuthorInfoAdmin(authorId, UserContext.getCurrentUserId());
+ }
vo.setSelf(authorId.equals(UserContext.getCurrentUserId()));
// 鏌ヨ鑾疯禐鏁�
List<String> videoIds = baseMapper.getVideoIdsByAuthor(authorId);
@@ -646,6 +989,9 @@
vo.setLikeNum(baseMapper.countAuthorVideoCollectNum(videoIds));
} else {
vo.setLikeNum(0L);
+ }
+ if (StringUtils.isNotBlank(vo.getAvatar())&&!vo.getAvatar().contains("http")) {
+ vo.setAvatar(cosUtil.getPreviewUrl(vo.getAvatar()));
}
return Result.ok().data(vo);
}
@@ -674,6 +1020,9 @@
v.setCommentNum(this.getCommentNum(v.getId(), v.getCommentNum()));
v.setCollectNum(this.getCollectNum(v.getId(), v.getCollectNum()));
v.setThumbsUpNum(this.getThumbsUpNum(v.getId(), v.getThumbsUpNum()));
+ if (StringUtils.isNotBlank(v.getAuthorAvatar())&&!v.getAuthorAvatar().contains("http")) {
+ 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()));
@@ -712,6 +1061,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()));
@@ -749,6 +1099,10 @@
v.setCommentNum(this.getCommentNum(v.getId(), v.getCommentNum()));
v.setCollectNum(this.getCollectNum(v.getId(), v.getCollectNum()));
v.setThumbsUpNum(this.getThumbsUpNum(v.getId(), v.getThumbsUpNum()));
+ String authorAvatar = v.getAuthorAvatar();
+ if (StringUtils.isNotBlank(authorAvatar)&&!authorAvatar.contains("http")) {
+ v.setAuthorAvatar(cosUtil.getPreviewUrl(authorAvatar));
+ }
if (VideoContentTypeEnum.VIDEO.getValue().equals(v.getVideoContentType())) {
v.setVideoUrl(cosUtil.getPreviewUrl(v.getVideoFileKey()));
v.setCoverUrl(cosUtil.getPreviewUrl(v.getCoverFileKey()));
@@ -838,7 +1192,8 @@
if (page.getTotal() > 0) {
Map<String, List<SimpleVideoTagVO>> tagMap = videoTagRefService.getTagsByVideoIds(
page.getRecords().stream().map(VideoVO::getId).collect(Collectors.toList())
- ).stream().collect(Collectors.groupingBy(SimpleVideoTagVO::getVideoId));;
+ ).stream().collect(Collectors.groupingBy(SimpleVideoTagVO::getVideoId));
+ ;
// 3. 鑾峰彇瑙嗛涓存椂璁块棶鍦板潃銆佽缃棰戞爣绛�
page.getRecords().forEach(v -> {
v.setTagList(tagMap.get(v.getId()));
@@ -864,7 +1219,7 @@
Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
String videoType = entity.getVideoType();
if (!VideoTypeEnum.HEALTH.getValue().equals(videoType)) {
- log.error("鍒犻櫎闈炲ぇ鍋ュ悍瑙嗛瑙嗛id涓�------->"+id);
+ log.error("鍒犻櫎闈炲ぇ鍋ュ悍瑙嗛瑙嗛id涓�------->" + id);
return Result.error("鍒犻櫎澶辫触");
}
baseMapper.deleteById(id);
@@ -950,7 +1305,7 @@
Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
String videoType = entity.getVideoType();
if (!VideoTypeEnum.COOK.getValue().equals(videoType)) {
- log.error("鍒犻櫎闈炲ぇ绁炲帹瑙嗛瑙嗛id涓�------->"+id);
+ log.error("鍒犻櫎闈炲ぇ绁炲帹瑙嗛瑙嗛id涓�------->" + id);
return Result.error("鍒犻櫎澶辫触");
}
baseMapper.deleteById(id);
@@ -996,7 +1351,7 @@
}
}
// 鏍囪瘑璇ヨ棰戦渶瑕侀�氳繃瀹氭椂浠诲姟缁熻鏀惰棌鏁�
- if (Objects.nonNull(video) && ! video.getCollectNumJob()) {
+ if (Objects.nonNull(video) && !video.getCollectNumJob()) {
new LambdaUpdateChainWrapper<>(baseMapper)
.eq(Video::getId, video.getId())
.set(Video::getCollectNumJob, Boolean.TRUE)
@@ -1059,7 +1414,7 @@
}
}
// 鏍囪瘑璇ヨ棰戦渶瑕侀�氳繃瀹氭椂浠诲姟缁熻鏀惰棌鏁�
- if (Objects.nonNull(video) && ! video.getCollectNumJob()) {
+ if (Objects.nonNull(video) && !video.getCollectNumJob()) {
new LambdaUpdateChainWrapper<>(baseMapper)
.eq(Video::getId, video.getId())
.set(Video::getThumbsUpNumJob, Boolean.TRUE)
@@ -1078,6 +1433,144 @@
.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())));
+ wxVideoVO.setAuthorAvatar(cosUtil.getPreviewUrl(wxVideoVO.getAuthorAvatar()));
+ 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());
+ }
+
+ @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()));
+ if (StringUtils.isNotBlank(v.getCoverFileKey())) {
+ 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());
+ }
}
--
Gitblit v1.8.0