|
|
@ -147,7 +147,7 @@ public class TopicServiceImpl implements TopicService { |
|
|
|
List<ScreenDifficultyImgDataEntity> imgs = topicDao.selectTopicImgs(list); |
|
|
|
if(CollectionUtils.isEmpty(imgs)) return Collections.EMPTY_MAP; |
|
|
|
//key -> topicId | value -> projectId
|
|
|
|
Map<String,String> projectTopicMap = list.stream().collect(Collectors.toMap(ProjectSourceMapFormDTO :: getSourceId,ProjectSourceMapFormDTO :: getProjectId)); |
|
|
|
Map<String,String> projectTopicMap = list.stream().collect(Collectors.toMap(ProjectSourceMapFormDTO :: getSourceId,ProjectSourceMapFormDTO :: getProjectId,(o,n)->n)); |
|
|
|
//key -> topicId
|
|
|
|
Map<String,List<ScreenDifficultyImgDataEntity>> result |
|
|
|
= imgs.stream().collect(Collectors.groupingBy(ScreenDifficultyImgDataEntity :: getEventId)); |
|
|
@ -178,7 +178,7 @@ public class TopicServiceImpl implements TopicService { |
|
|
|
if(CollectionUtils.isEmpty(contents)) return Collections.EMPTY_MAP; |
|
|
|
Map<String,String> topicContentMap = contents.stream().collect(Collectors.toMap(TopicContentResultDTO :: getTopicId,TopicContentResultDTO::getContent)); |
|
|
|
//key -> topicId | value -> projectId
|
|
|
|
Map<String,String> projectTopicMap = list.stream().collect(Collectors.toMap(ProjectSourceMapFormDTO :: getSourceId,ProjectSourceMapFormDTO :: getProjectId)); |
|
|
|
Map<String,String> projectTopicMap = list.stream().collect(Collectors.toMap(ProjectSourceMapFormDTO :: getSourceId,ProjectSourceMapFormDTO :: getProjectId,(o,n)->n)); |
|
|
|
Map<String,String> result = new HashMap<>(); |
|
|
|
projectTopicMap.forEach((topic,project) -> { |
|
|
|
result.put(project,topicContentMap.get(topic)); |
|
|
|