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

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

@@ -508,7 +508,6 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
 //        }
         sheet.setComposer(musicSheetApplication.getComposer());
         sheet.setAudioType(AudioTypeEnum.valueOf(musicSheetApplication.getPlayMode().getCode()));
-        sheet.setMp3Type(AudioTypeEnum.valueOf(musicSheetApplication.getIsPlayBeat()&&musicSheetApplication.getIsUseSystemBeat()?"MP3":"MP3_METRONOME"));
         if (StringUtils.isNotEmpty(musicSheetApplication.getPlaySpeed())) {
             sheet.setPlaySpeed(musicSheetApplication.getPlaySpeed());
         }
@@ -544,6 +543,8 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         if (musicSheetApplication.getAppAuditFlag() != null){
             sheet.setAuditVersion(musicSheetApplication.getAppAuditFlag()?YesOrNoEnum.YES:YesOrNoEnum.NO);
         }
+        sheet.setHasBeat((musicSheetApplication.getIsPlayBeat() && !musicSheetApplication.getIsUseSystemBeat()) ? YesOrNoEnum.YES : YesOrNoEnum.NO);
+        sheet.setMp3Type((musicSheetApplication.getIsPlayBeat() && musicSheetApplication.getIsUseSystemBeat()) ? AudioTypeEnum.MP3 : AudioTypeEnum.MP3_METRONOME);
         sheet.setUpdateBy(musicSheetApplication.getUpdateBy());
         sheet.setExtConfigJson(musicSheetApplication.getExtConfigJson());
         sheet.setMusicJSON(musicSheetApplication.getMusicJson());
@@ -791,25 +792,11 @@ 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())){
-            StringBuffer sb = new StringBuffer();
-            for (String s : musicSheetApplication.getSubjectIds().split(",")) {
-                CbsSubjectApiWrapper.Subject subject = subjectMap.get(Long.parseLong(s));
-                if(subject != null){
-                    if (sb.length() > 0) {
-                        sb.append(",");
-                    }
-                    sb.append(subject.getSubjectName());
-                }
-            }
-            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.setMusicTagNames(musicSheetApplication.getMusicTagNames());
         List<CbsMusicSheetWrapper.MusicSheetAccompaniment> accompanimentList = musicSheetApplication.getMusicSheetAccompanimentList();
         if (CollectionUtils.isNotEmpty(accompanimentList)) {
@@ -819,6 +806,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         record.setMidiUrl(musicSheetApplication.getMidiFileUrl());
         record.setAuditVersion(musicSheetApplication.getAppAuditFlag() ? YesOrNoEnum.YES : YesOrNoEnum.NO);
         record.setHasBeat((musicSheetApplication.getIsPlayBeat() && !musicSheetApplication.getIsUseSystemBeat()) ? YesOrNoEnum.YES : YesOrNoEnum.NO);
+        record.setMp3Type((musicSheetApplication.getIsPlayBeat() && musicSheetApplication.getIsUseSystemBeat()) ? AudioTypeEnum.MP3 : AudioTypeEnum.MP3_METRONOME);
         record.setExtConfigJson(musicSheetApplication.getExtConfigJson());
         record.setMusicJSON(musicSheetApplication.getMusicJson());
         record.setMusicJianSvg(musicSheetApplication.getMusicJianSvg());
@@ -871,38 +859,6 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
 
             // 统计单曲归属专辑数
             updateMusicAlbumNumInfo(records);
-
-            // 标签
-            /*List<Long>collect = records.stream().map(MusicSheetVo::getMusicTag)
-                             .filter(StringUtils::isNotEmpty)
-                             .flatMap(s -> Arrays.stream(s.split(",")))
-                             .filter(StringUtils::isNotEmpty)
-                             .map(Long::parseLong)
-                             .collect(Collectors.toList());
-            List<MusicTag> list = new ArrayList<>();
-            if (CollectionUtils.isNotEmpty(collect)) {
-                list = musicTagService.lambdaQuery()
-                                      .in(MusicTag::getId, collect)
-                                      .eq(MusicTag::getDelFlag, 0)
-                                      .eq(MusicTag::getState, 1)
-                                      .list();
-            }
-            if (CollectionUtils.isNotEmpty(list)) {
-                Map<Long, String> tagMap = list.stream()
-                                                          .collect(Collectors.toMap(MusicTag::getId, MusicTag::getName));
-                for (MusicSheetVo record : records) {
-                    if (StringUtils.isNotEmpty(record.getMusicTag())) {
-
-                        List<Long> tagIdList = Arrays.stream(record.getMusicTag().split(","))
-                                                    .filter(StringUtils::isNotEmpty)
-                                                    .map(Long::parseLong)
-                                                    .collect(Collectors.toList());
-                        String tagNames = tagIdList.stream().map(tagMap::get).collect(Collectors.joining(","));
-                        record.setMusicTagNames(tagNames);
-                    }
-                }
-            }*/
-
             // 是否关注
             if (query.getStudentId() != null) {
                 List<Long> musicIdList = records.stream().map(MusicSheetVo::getId).collect(Collectors.toList());
@@ -2018,6 +1974,9 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         if (addMusicSheet.getAudioType() == null) {
             addMusicSheet.setAudioType(EAudioType.HOMEMODE);
         }
+        if (addMusicSheet.getIsUseSystemBeat() == null) {
+            addMusicSheet.setIsUseSystemBeat(true);
+        }
     }
 
     @Override
@@ -2062,6 +2021,14 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         if(addMusicSheet.getIsEvaluated() != null){
             musicSheetAudit.setCanEvaluate(addMusicSheet.getIsEvaluated()? YesOrNoEnum.YES: YesOrNoEnum.NO);
         }
+        //兼容审核流程修改，是否自带节拍器
+        if(addMusicSheet.getIsUseSystemBeat() == null || !addMusicSheet.getIsUseSystemBeat()){
+            musicSheetAudit.setHasBeat(YesOrNoEnum.NO);
+            musicSheetAudit.setMp3Type(AudioTypeEnum.MP3);
+        }else {
+            musicSheetAudit.setHasBeat(YesOrNoEnum.YES);
+            musicSheetAudit.setMp3Type(AudioTypeEnum.MP3_METRONOME);
+        }
         List<CbsMusicSheetWrapper.MusicSheetAccompaniment> accompanimentList = addMusicSheet.getMusicSheetAccompanimentList();
         if (CollectionUtils.isNotEmpty(accompanimentList)) {
             musicSheetAudit.setMetronomeUrl(accompanimentList.get(0).getAudioFileUrl());