|
@@ -3,7 +3,6 @@ package cn.reghao.tnb.content.app.vod.service.impl;
|
|
|
import cn.reghao.file.api.iface.OssService;
|
|
import cn.reghao.file.api.iface.OssService;
|
|
|
import cn.reghao.jutil.jdk.db.Page;
|
|
import cn.reghao.jutil.jdk.db.Page;
|
|
|
import cn.reghao.jutil.jdk.db.PageList;
|
|
import cn.reghao.jutil.jdk.db.PageList;
|
|
|
-import cn.reghao.jutil.jdk.serializer.JsonConverter;
|
|
|
|
|
import cn.reghao.jutil.web.WebResult;
|
|
import cn.reghao.jutil.web.WebResult;
|
|
|
import cn.reghao.oss.sdk.model.dto.media.VideoInfo;
|
|
import cn.reghao.oss.sdk.model.dto.media.VideoInfo;
|
|
|
import cn.reghao.oss.sdk.model.dto.media.VideoUrlDto;
|
|
import cn.reghao.oss.sdk.model.dto.media.VideoUrlDto;
|
|
@@ -17,7 +16,6 @@ import cn.reghao.tnb.content.api.dto.VideoCard;
|
|
|
import cn.reghao.tnb.content.api.dto.VideoPostCard;
|
|
import cn.reghao.tnb.content.api.dto.VideoPostCard;
|
|
|
import cn.reghao.tnb.content.app.vod.db.mapper.*;
|
|
import cn.reghao.tnb.content.app.vod.db.mapper.*;
|
|
|
import cn.reghao.tnb.content.app.vod.db.repository.VideoRepository;
|
|
import cn.reghao.tnb.content.app.vod.db.repository.VideoRepository;
|
|
|
-import cn.reghao.tnb.content.app.vod.feign.UserFeignClient;
|
|
|
|
|
import cn.reghao.tnb.content.app.vod.model.po.*;
|
|
import cn.reghao.tnb.content.app.vod.model.po.*;
|
|
|
import cn.reghao.tnb.content.app.vod.model.vo.BannerVideoVO;
|
|
import cn.reghao.tnb.content.app.vod.model.vo.BannerVideoVO;
|
|
|
import cn.reghao.tnb.content.app.vod.model.vo.VideoDetail;
|
|
import cn.reghao.tnb.content.app.vod.model.vo.VideoDetail;
|
|
@@ -26,7 +24,6 @@ import cn.reghao.tnb.content.app.vod.service.CategoryService;
|
|
|
import cn.reghao.tnb.content.app.vod.service.ContentPermission;
|
|
import cn.reghao.tnb.content.app.vod.service.ContentPermission;
|
|
|
import cn.reghao.tnb.content.app.vod.service.VideoPostQuery;
|
|
import cn.reghao.tnb.content.app.vod.service.VideoPostQuery;
|
|
|
import cn.reghao.tnb.user.api.dto.UserCard;
|
|
import cn.reghao.tnb.user.api.dto.UserCard;
|
|
|
-import cn.reghao.tnb.user.api.dto.UserInfo;
|
|
|
|
|
import cn.reghao.tnb.user.api.iface.UserService;
|
|
import cn.reghao.tnb.user.api.iface.UserService;
|
|
|
import org.apache.dubbo.config.annotation.DubboReference;
|
|
import org.apache.dubbo.config.annotation.DubboReference;
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
@@ -64,13 +61,12 @@ public class VideoPostQueryImpl implements VideoPostQuery {
|
|
|
private final VideoRepository videoRepository;
|
|
private final VideoRepository videoRepository;
|
|
|
private final Random random = new SecureRandom();
|
|
private final Random random = new SecureRandom();
|
|
|
private final BannerVideoMapper bannerVideoMapper;
|
|
private final BannerVideoMapper bannerVideoMapper;
|
|
|
- private final UserFeignClient userFeignClient;
|
|
|
|
|
|
|
|
|
|
public VideoPostQueryImpl(VideoPostMapper videoPostMapper, VideoFileMapper videoFileMapper, VideoTagMapper videoTagMapper,
|
|
public VideoPostQueryImpl(VideoPostMapper videoPostMapper, VideoFileMapper videoFileMapper, VideoTagMapper videoTagMapper,
|
|
|
VideoStatisticMapper videoStatisticMapper, VideoCategoryPostMapper videoCategoryPostMapper,
|
|
VideoStatisticMapper videoStatisticMapper, VideoCategoryPostMapper videoCategoryPostMapper,
|
|
|
ContentPermission contentPermission, CategoryService categoryService,
|
|
ContentPermission contentPermission, CategoryService categoryService,
|
|
|
VideoRepository videoRepository, VideoPostTagMapper videoPostTagMapper,
|
|
VideoRepository videoRepository, VideoPostTagMapper videoPostTagMapper,
|
|
|
- BannerVideoMapper bannerVideoMapper, UserFeignClient userFeignClient) {
|
|
|
|
|
|
|
+ BannerVideoMapper bannerVideoMapper) {
|
|
|
this.videoPostMapper = videoPostMapper;
|
|
this.videoPostMapper = videoPostMapper;
|
|
|
this.videoFileMapper = videoFileMapper;
|
|
this.videoFileMapper = videoFileMapper;
|
|
|
this.videoTagMapper = videoTagMapper;
|
|
this.videoTagMapper = videoTagMapper;
|
|
@@ -81,7 +77,6 @@ public class VideoPostQueryImpl implements VideoPostQuery {
|
|
|
this.videoRepository = videoRepository;
|
|
this.videoRepository = videoRepository;
|
|
|
this.videoPostTagMapper = videoPostTagMapper;
|
|
this.videoPostTagMapper = videoPostTagMapper;
|
|
|
this.bannerVideoMapper = bannerVideoMapper;
|
|
this.bannerVideoMapper = bannerVideoMapper;
|
|
|
- this.userFeignClient = userFeignClient;
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
public List<VideoCard> getVideoCards(List<String> videoIds) {
|
|
public List<VideoCard> getVideoCards(List<String> videoIds) {
|
|
@@ -262,9 +257,6 @@ public class VideoPostQueryImpl implements VideoPostQuery {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
long publishBy = videoPost.getPublishBy();
|
|
long publishBy = videoPost.getPublishBy();
|
|
|
- String userInfoJson = userFeignClient.getUserInfo(publishBy);
|
|
|
|
|
- UserInfo userInfo = JsonConverter.jsonToObject(userInfoJson, UserInfo.class);
|
|
|
|
|
-
|
|
|
|
|
String publishByStr = accountQuery.getUserIdStr(publishBy);
|
|
String publishByStr = accountQuery.getUserIdStr(publishBy);
|
|
|
VideoStatistic videoStatistic = videoStatisticMapper.findByVideoId(videoId);
|
|
VideoStatistic videoStatistic = videoStatisticMapper.findByVideoId(videoId);
|
|
|
VideoDetail videoDetail = new VideoDetail(videoPost, videoStatistic, publishByStr);
|
|
VideoDetail videoDetail = new VideoDetail(videoPost, videoStatistic, publishByStr);
|