混音节拍器

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/SysMusicScore.java

@@ -151,6 +151,15 @@ public class SysMusicScore {
 	@ApiModelProperty("是否支持混音节拍器")
 	private Boolean isMixBeat;
 
+	@ApiModelProperty("总谱五线谱PDF文件")
+	private String musicPdfUrl;
+
+	@ApiModelProperty("总谱首调PDF文件")
+	private String firstPdfUrl;
+
+	@ApiModelProperty("总谱固定调PDF文件")
+	private String jianPdfUrl;
+
 	@ApiModelProperty("原音五线谱PDF文件")
 	private String soundMusicPdfUrl;
 

mec-biz/src/main/java/com/ym/mec/biz/dal/wrapper/MusicSheetWrapper.java

@@ -353,7 +353,6 @@ public class MusicSheetWrapper {
         @ApiModelProperty("曲目缓存")
         private String musicSvg;
 
-
         @ApiModelProperty("评测标准 节奏 AMPLITUDE 音准 FREQUENCY 分贝 DECIBELS")
         private EEvaluationStandard evaluationStandard;
 
@@ -423,6 +422,14 @@ public class MusicSheetWrapper {
         @ApiModelProperty("是否支持混音节拍器")
         private Boolean isMixBeat;
 
+        @ApiModelProperty("总谱五线谱PDF文件")
+        private String musicPdfUrl;
+
+        @ApiModelProperty("总谱首调PDF文件")
+        private String firstPdfUrl;
+
+        @ApiModelProperty("总谱固定调PDF文件")
+        private String jianPdfUrl;
 
         @ApiModelProperty("曲目伴奏")
         private List<CbsMusicSheetWrapper.MusicSheetAccompaniment> musicSheetAccompanimentList;

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

@@ -93,10 +93,11 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Strin
 				record.setJianPdfUrl(sound.getJianPdfUrl());
 				List<CbsMusicSheetWrapper.MusicSheetAccompaniment> accompanimentList = musicSheetApplication.getMusicSheetAccompanimentList();
 				if (CollectionUtils.isNotEmpty(accompanimentList)) {
-					record.setMetronomeUrl(accompanimentList.get(0).getAudioFileUrl());
-					record.setMusicPdfUrl(accompanimentList.get(0).getMusicPdfUrl());
-					record.setFirstPdfUrl(accompanimentList.get(0).getFirstPdfUrl());
-					record.setJianPdfUrl(accompanimentList.get(0).getJianPdfUrl());
+					CbsMusicSheetWrapper.MusicSheetAccompaniment accompaniment1 = accompanimentList.get(0);
+					record.setMetronomeUrl(accompaniment1.getAudioFileUrl());
+					record.setMusicPdfUrl(accompaniment1.getMusicPdfUrl());
+					record.setFirstPdfUrl(accompaniment1.getFirstPdfUrl());
+					record.setJianPdfUrl(accompaniment1.getJianPdfUrl());
 				}
 				record.setMp3Url(sound.getAudioFileUrl());
 				record.setIsScoreRender(musicSheetApplication.getIsScoreRender());

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

@@ -215,21 +215,26 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
         record.setSpeed(musicSheetApplication.getPlaySpeed());
         record.setIsOpenMetronome(musicSheetApplication.getIsUseSystemBeat());
         record.setIsMixBeat(musicSheetApplication.getIsMixBeat());
+        record.setAccMusicPdfUrl(musicSheetApplication.getMusicPdfUrl());
+        record.setAccFirstPdfUrl(musicSheetApplication.getFirstPdfUrl());
+        record.setAccJianPdfUrl(musicSheetApplication.getJianPdfUrl());
         List<CbsMusicSheetWrapper.MusicSheetAccompaniment> accompanimentList = musicSheetApplication.getMusicSheetAccompanimentList();
         if (CollectionUtils.isNotEmpty(accompanimentList)) {
-            record.setMetronomeUrl(accompanimentList.get(0).getAudioFileUrl());
-            record.setUrl(accompanimentList.get(0).getAudioFileUrl());
-            record.setAccMusicPdfUrl(accompanimentList.get(0).getMusicPdfUrl());
-            record.setAccFirstPdfUrl(accompanimentList.get(0).getFirstPdfUrl());
-            record.setAccJianPdfUrl(accompanimentList.get(0).getJianPdfUrl());
+            CbsMusicSheetWrapper.MusicSheetAccompaniment accompaniment = accompanimentList.get(0);
+            record.setMetronomeUrl(accompaniment.getAudioFileUrl());
+            record.setUrl(accompaniment.getAudioFileUrl());
+            record.setAccMusicPdfUrl(accompaniment.getMusicPdfUrl());
+            record.setAccFirstPdfUrl(accompaniment.getFirstPdfUrl());
+            record.setAccJianPdfUrl(accompaniment.getJianPdfUrl());
         }
         List<CbsMusicSheetWrapper.MusicSheetSound> soundList = musicSheetApplication.getMusicSheetSoundList();
         if (CollectionUtils.isNotEmpty(soundList)) {
-            record.setAccompanimentMetronomeUrl(soundList.get(0).getAudioFileUrl());
-            record.setAccompanimentUrl(soundList.get(0).getAudioFileUrl());
-            record.setSoundMusicPdfUrl(soundList.get(0).getMusicPdfUrl());
-            record.setSoundFirstPdfUrl(soundList.get(0).getFirstPdfUrl());
-            record.setSoundJianPdfUrl(soundList.get(0).getJianPdfUrl());
+            CbsMusicSheetWrapper.MusicSheetSound sheetSound = soundList.get(0);
+            record.setAccompanimentMetronomeUrl(sheetSound.getAudioFileUrl());
+            record.setAccompanimentUrl(sheetSound.getAudioFileUrl());
+            record.setSoundMusicPdfUrl(sheetSound.getMusicPdfUrl());
+            record.setSoundFirstPdfUrl(sheetSound.getFirstPdfUrl());
+            record.setSoundJianPdfUrl(sheetSound.getJianPdfUrl());
         }
         record.setXmlUrl(musicSheetApplication.getXmlFileUrl());
         record.setMidiUrl(musicSheetApplication.getMidiFileUrl());