Commit b6b27099 authored by 刘基明's avatar 刘基明

修复

parent 6b62264c
...@@ -73,8 +73,6 @@ public class BatchFeignCallService { ...@@ -73,8 +73,6 @@ public class BatchFeignCallService {
@Resource @Resource
private TopicService topicService; private TopicService topicService;
@Resource
private UserInfoService userInfoService;
public void getAttachDetail(ThemeQo themeQo) { public void getAttachDetail(ThemeQo themeQo) {
...@@ -193,14 +191,14 @@ public class BatchFeignCallService { ...@@ -193,14 +191,14 @@ public class BatchFeignCallService {
if (!CollectionUtils.isEmpty(shortVideoIds)) { if (!CollectionUtils.isEmpty(shortVideoIds)) {
// 短视频列表 // 短视频列表
List<ShortVideoBaseInfoResp> list = feignService.batchGetShortVideoBaseInfo(setToList(shortVideoIds)); List<ShortVideoBaseInfoResp> list = feignService.batchGetShortVideoBaseInfo(setToList(shortVideoIds));
shortVideoMap.putAll(list.stream().collect(Collectors.toMap(ShortVideoBaseInfoResp::getSourceId, item -> item))); shortVideoMap.putAll(list.stream().collect(Collectors.toMap(ShortVideoBaseInfoResp::getSourceId, item -> item,(oldValue,newValue)->oldValue)));
} }
if (!CollectionUtils.isEmpty(curriculumIds)) { if (!CollectionUtils.isEmpty(curriculumIds)) {
// 课程列表 // 课程列表
List<ShortVideoBaseInfoResp> commonResp = feignService.getCurriculumByColumnRelId(setToList(curriculumIds)); List<ShortVideoBaseInfoResp> commonResp = feignService.getCurriculumByColumnRelId(setToList(curriculumIds));
if (commonResp != null && !CollectionUtils.isEmpty(commonResp)) { if (commonResp != null && !CollectionUtils.isEmpty(commonResp)) {
curriculumMap.putAll(commonResp.stream() curriculumMap.putAll(commonResp.stream()
.collect(Collectors.toMap(ShortVideoBaseInfoResp::getColumnRelId, item -> item))); .collect(Collectors.toMap(ShortVideoBaseInfoResp::getColumnRelId, item -> item,(oldValue,newValue)->oldValue)));
} }
} }
if (!CollectionUtils.isEmpty(courseIds)) { if (!CollectionUtils.isEmpty(courseIds)) {
...@@ -208,7 +206,7 @@ public class BatchFeignCallService { ...@@ -208,7 +206,7 @@ public class BatchFeignCallService {
CommonResp<List<CourseSimpleResp>> commonResp = CommonResp<List<CourseSimpleResp>> commonResp =
feignForCourse.getCourseSimpleList(setToList(courseIds)); feignForCourse.getCourseSimpleList(setToList(courseIds));
if (commonResp.isSuccess() & !CollectionUtils.isEmpty(commonResp.getData())) { if (commonResp.isSuccess() & !CollectionUtils.isEmpty(commonResp.getData())) {
courseMap.putAll(commonResp.getData().stream().collect(Collectors.toMap(CourseSimpleResp::getCourseId, item -> item))); courseMap.putAll(commonResp.getData().stream().collect(Collectors.toMap(CourseSimpleResp::getCourseId, item -> item,(oldValue,newValue)->oldValue)));
} }
} }
if (!CollectionUtils.isEmpty(zhiboIds)) { if (!CollectionUtils.isEmpty(zhiboIds)) {
...@@ -216,7 +214,7 @@ public class BatchFeignCallService { ...@@ -216,7 +214,7 @@ public class BatchFeignCallService {
CommonResp<List<ZhiboListResp>> commonResp = CommonResp<List<ZhiboListResp>> commonResp =
feignClientForZhibo.simpleList(setToList(zhiboIds)); feignClientForZhibo.simpleList(setToList(zhiboIds));
if (commonResp.isSuccess() && !CollectionUtils.isEmpty(commonResp.getData())) { if (commonResp.isSuccess() && !CollectionUtils.isEmpty(commonResp.getData())) {
zhiboMap.putAll(commonResp.getData().stream().collect(Collectors.toMap(ZhiboListResp::getId, item -> item))); zhiboMap.putAll(commonResp.getData().stream().collect(Collectors.toMap(ZhiboListResp::getId, item -> item,(oldValue,newValue)->oldValue)));
} }
} }
if (!CollectionUtils.isEmpty(imageIds)) { if (!CollectionUtils.isEmpty(imageIds)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment