|
@@ -93,6 +93,8 @@ public class ContentPlatformPlanServiceImpl implements ContentPlatformPlanServic
|
|
|
private CgiReplyService cgiReplyService;
|
|
private CgiReplyService cgiReplyService;
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private TouLiuHttpClient touLiuHttpClient;
|
|
private TouLiuHttpClient touLiuHttpClient;
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ ContentPlatformCollectContentService collectService;
|
|
|
|
|
|
|
|
|
|
|
|
|
@Value("${vlog.share.appType:11}")
|
|
@Value("${vlog.share.appType:11}")
|
|
@@ -636,6 +638,10 @@ public class ContentPlatformPlanServiceImpl implements ContentPlatformPlanServic
|
|
|
List<ContentPlatformVideoTag> videoTagList = planMapperExt.getVideoTagList(dt, videoIds, user.getId(), type, userChannel);
|
|
List<ContentPlatformVideoTag> videoTagList = planMapperExt.getVideoTagList(dt, videoIds, user.getId(), type, userChannel);
|
|
|
Map<Long, List<ContentPlatformVideoTag>> videoTagMap = videoTagList.stream()
|
|
Map<Long, List<ContentPlatformVideoTag>> videoTagMap = videoTagList.stream()
|
|
|
.collect(Collectors.groupingBy(ContentPlatformVideoTag::getVideoId));
|
|
.collect(Collectors.groupingBy(ContentPlatformVideoTag::getVideoId));
|
|
|
|
|
+ // collect
|
|
|
|
|
+ List<ContentPlatformVideoCollect> collectVideoList = collectService.getCollectVideoList(user.getId(), videoIds);
|
|
|
|
|
+ Map<Long, ContentPlatformVideoCollect> collectVideoMap = collectVideoList.stream()
|
|
|
|
|
+ .collect(Collectors.toMap(ContentPlatformVideoCollect::getVideoId, o -> o));
|
|
|
List<VideoContentItemVO> result = new ArrayList<>();
|
|
List<VideoContentItemVO> result = new ArrayList<>();
|
|
|
for (ContentPlatformVideo video : videoList) {
|
|
for (ContentPlatformVideo video : videoList) {
|
|
|
VideoContentItemVO item = new VideoContentItemVO();
|
|
VideoContentItemVO item = new VideoContentItemVO();
|
|
@@ -664,6 +670,10 @@ public class ContentPlatformPlanServiceImpl implements ContentPlatformPlanServic
|
|
|
}
|
|
}
|
|
|
item.setTags(tags);
|
|
item.setTags(tags);
|
|
|
}
|
|
}
|
|
|
|
|
+ if (collectVideoMap.containsKey(video.getVideoId())) {
|
|
|
|
|
+ item.setCollect(1);
|
|
|
|
|
+ }
|
|
|
|
|
+ item.setStatus(1);
|
|
|
result.add(item);
|
|
result.add(item);
|
|
|
}
|
|
}
|
|
|
return result;
|
|
return result;
|