酷乐秀曲目来源改为内容平台

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/MusicSheetServiceImpl.java

@@ -757,7 +757,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
     }
 
     public void initMusicSheetVo(MusicSheetVo record,CbsMusicSheetWrapper.MusicSheetApplication musicSheetApplication,Map<Long, CbsSubjectApiWrapper.Subject> subjectMap){
-        if(StringUtils.isNotEmpty(musicSheetApplication.getSubjectIds())){
+        /*if(StringUtils.isNotEmpty(musicSheetApplication.getSubjectIds())){
             StringBuffer sb = new StringBuffer();
             for (String s : musicSheetApplication.getSubjectIds().split(",")) {
                 CbsSubjectApiWrapper.Subject subject = subjectMap.get(Long.parseLong(s));
@@ -769,12 +769,13 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
                 }
             }
             record.setSubjectNames(sb.toString());
-        }
+        }*/
+        record.setSubjectNames(musicSheetApplication.getSubjectNames());
         record.setCbsMusicSheetId(musicSheetApplication.getId());
         record.setAudioType(AudioTypeEnum.valueOf(musicSheetApplication.getPlayMode().getCode()));
         record.setCanEvaluate(musicSheetApplication.getIsEvaluated() ? YesOrNoEnum.YES : YesOrNoEnum.NO);
         record.setShowFingering(musicSheetApplication.getIsShowFingering() ? YesOrNoEnum.YES : YesOrNoEnum.NO);
-        record.setMusicTag(musicSheetApplication.getMusicTagIds());
+//        record.setMusicTag(musicSheetApplication.getMusicTagIds());
         record.setMusicTagNames(musicSheetApplication.getMusicTagNames());
         List<CbsMusicSheetWrapper.MusicSheetAccompaniment> accompanimentList = musicSheetApplication.getMusicSheetAccompanimentList();
         if (CollectionUtils.isNotEmpty(accompanimentList)) {
@@ -835,28 +836,8 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
             // 统计单曲归属专辑数
             updateMusicAlbumNumInfo(records);
 
-            // 声部
-
-            /*List<Long> collect = records.stream().map(MusicSheetVo::getMusicSubject)
-                                          .filter(StringUtils::isNotEmpty)
-                                            .map(Long::parseLong)
-                                          .collect(Collectors.toList());
-
-
-            List<Subject> subjectList = subjectService.findBySubjectByIdList(collect);
-            if (CollectionUtils.isNotEmpty(subjectList)) {
-                Map<Long, String> subjectMap = subjectList.stream()
-                                                        .collect(Collectors.toMap(Subject::getId, Subject::getName));
-                for (MusicSheetVo record : records) {
-                    if (StringUtils.isNotEmpty(record.getMusicSubject())) {
-                        record.setSubjectNames(subjectMap.get(Long.parseLong(record.getMusicSubject())));
-                    }
-                }
-            }*/
-
             // 标签
-
-            List<Long>collect = records.stream().map(MusicSheetVo::getMusicTag)
+            /*List<Long>collect = records.stream().map(MusicSheetVo::getMusicTag)
                              .filter(StringUtils::isNotEmpty)
                              .flatMap(s -> Arrays.stream(s.split(",")))
                              .filter(StringUtils::isNotEmpty)
@@ -884,7 +865,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
                         record.setMusicTagNames(tagNames);
                     }
                 }
-            }
+            }*/
 
             // 是否关注
             if (query.getStudentId() != null) {

cooleshow-user/user-biz/src/main/resources/config/mybatis/MusicSheetMapper.xml

@@ -129,10 +129,6 @@
 
     <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.vo.MusicSheetVo">
         select <include refid="Base_Column_List"/>
-        ,(select group_concat(mt.name_) from music_tag mt
-            where find_in_set(mt.id_,t.music_tag_) and mt.del_flag_ = 0  and mt.state_ = 1) as musicTagNames
-        ,(select group_concat(s.name_) from subject s
-            where find_in_set(s.id_,t.music_subject_) and s.del_flag_ = 0 ) as subjectNames
         from music_sheet t
         left join sys_user su on t.create_by_ = su.id_
         <if test="param.sortByAlbumIdDesc != null">