Merge branch 'zx_saas_cbs' of http://git.dayaedu.com/yonge/mec into dev

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysMusicScoreAccompanimentServiceImpl.java

@@ -112,19 +112,21 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Integ
 				record.setExamSongName(musicSheetApplication.getName());
 				record.setCategoriesName(musicSheetApplication.getMusicSheetCategoryName());
 				record.setSpeed(musicSheetApplication.getPlaySpeed());
-				List<CbsMusicSheetWrapper.MusicSheetAccompaniment> accompanimentList = musicSheetApplication.getMusicSheetAccompanimentList();
-				if (CollectionUtils.isNotEmpty(accompanimentList)) {
-					record.setMetronomeUrl(accompanimentList.get(0).getAudioFileUrl());
-				}
 				CbsMusicSheetWrapper.MusicSheetSound sound = musicSheetApplication.getMusicSheetSoundList().get(i);
-				record.setMp3Url(sound.getAudioFileUrl());
 				record.setMetronomeMp3Url(sound.getAudioFileUrl());
 				record.setTrack(sound.getTrack());
 				record.setSubjectName(sound.getTrack());
 				record.setXmlUrl(musicSheetApplication.getXmlFileUrl());
 				record.setMidiUrl(musicSheetApplication.getMidiFileUrl());
 				record.setEnableEvaluation(musicSheetApplication.getIsEvaluated());
-				record.setIsOpenMetronome(musicSheetApplication.getIsUseSystemBeat() && musicSheetApplication.getIsPlayBeat());
+				record.setIsOpenMetronome(!musicSheetApplication.getIsUseSystemBeat() && musicSheetApplication.getIsPlayBeat());
+				List<CbsMusicSheetWrapper.MusicSheetAccompaniment> accompanimentList = musicSheetApplication.getMusicSheetAccompanimentList();
+				if (CollectionUtils.isNotEmpty(accompanimentList)) {
+					record.setMetronomeUrl(accompanimentList.get(0).getAudioFileUrl());
+					record.setUrl(accompanimentList.get(0).getAudioFileUrl());
+				}
+				record.setMetronomeMp3Url(sound.getAudioFileUrl());
+				record.setMp3Url(sound.getAudioFileUrl());
 				record.setIsShowFingering(musicSheetApplication.getIsShowFingering());
 				childAccompaniments.add(record);
 			}

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysMusicScoreServiceImpl.java

@@ -191,6 +191,7 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
             record.setCategoriesName(categoriesMap.get(musicSheetApplication.getMusicSheetCategoryId().intValue()));
         }
         record.setSpeed(musicSheetApplication.getPlaySpeed());
+        record.setIsOpenMetronome(musicSheetApplication.getIsUseSystemBeat());
         List<CbsMusicSheetWrapper.MusicSheetAccompaniment> accompanimentList = musicSheetApplication.getMusicSheetAccompanimentList();
         if (CollectionUtils.isNotEmpty(accompanimentList)) {
             record.setMetronomeUrl(accompanimentList.get(0).getAudioFileUrl());
@@ -205,7 +206,6 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
         record.setMidiUrl(musicSheetApplication.getMidiFileUrl());
         record.setOrder(musicSheetApplication.getSortNo());
         record.setEnableEvaluation(musicSheetApplication.getIsEvaluated());
-        record.setIsOpenMetronome(musicSheetApplication.getIsUseSystemBeat() && musicSheetApplication.getIsPlayBeat());
         if(musicSheetApplication.getMusicSheetType() == EMusicSheetType.CONCERT){
             record.setSubjectName("");
         }else {
@@ -447,6 +447,11 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
         // 伴奏，原音 扩展信息
         if (addMusicSheet.getPlayMode() == EMusicPlayMode.MP3) {
             CbsMusicSheetWrapper.MusicSheetAccompaniment musicSheetAccompaniment = new CbsMusicSheetWrapper.MusicSheetAccompaniment();
+            if (from.getIsOpenMetronome()) {
+                musicSheetAccompaniment.setAudioFileUrl(from.getMetronomeUrl());
+            }else {
+                musicSheetAccompaniment.setAudioFileUrl(from.getUrl());
+            }
             if (StringUtils.isNotBlank(musicSheetAccompaniment.getAudioFileUrl())) {
                 addMusicSheet.setMusicSheetAccompanimentList(Lists.newArrayList(musicSheetAccompaniment));
             }
@@ -455,7 +460,7 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
                 int i = 0;
                 for (SysMusicScoreAccompaniment sheetAccompaniment : accList) {
                     CbsMusicSheetWrapper.MusicSheetSound musicSheetSound = new CbsMusicSheetWrapper.MusicSheetSound();
-                    if (StringUtils.isNotBlank(sheetAccompaniment.getMetronomeMp3Url())){
+                    if (sheetAccompaniment.getIsOpenMetronome()){
                         musicSheetSound.setAudioFileUrl(sheetAccompaniment.getMetronomeMp3Url());
                     } else {
                         musicSheetSound.setAudioFileUrl(sheetAccompaniment.getMp3Url());