混音节拍器

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

@@ -113,15 +113,36 @@ public class SysMusicScoreAccompaniment {
 	@ApiModelProperty("演奏是否默认展示总谱渲染")
 	private Boolean defaultScoreRender;
 
-	@ApiModelProperty("五线谱PDF文件")
+	@ApiModelProperty("是否支持混音节拍器")
+	private Boolean isMixBeat;
+
+	@ApiModelProperty("总谱五线谱PDF文件")
 	private String musicPdfUrl;
 
-	@ApiModelProperty("首调PDF文件")
+	@ApiModelProperty("总谱首调PDF文件")
 	private String firstPdfUrl;
 
-	@ApiModelProperty("固定调PDF文件")
+	@ApiModelProperty("总谱固定调PDF文件")
 	private String jianPdfUrl;
 
+	@ApiModelProperty("原音五线谱PDF文件")
+	private String soundMusicPdfUrl;
+
+	@ApiModelProperty("原音首调PDF文件")
+	private String soundFirstPdfUrl;
+
+	@ApiModelProperty("原音固定调PDF文件")
+	private String soundJianPdfUrl;
+
+	@ApiModelProperty("伴奏五线谱PDF文件")
+	private String accMusicPdfUrl;
+
+	@ApiModelProperty("伴奏首调PDF文件")
+	private String accFirstPdfUrl;
+
+	@ApiModelProperty("伴奏固定调PDF文件")
+	private String accJianPdfUrl;
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -80,6 +80,9 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Strin
 			List<SysMusicScoreAccompaniment> childAccompaniments = new ArrayList<>();
 			for (int i = 0; i < musicSheetApplication.getMusicSheetSoundList().size(); i++) {
 				SysMusicScoreAccompaniment record = new SysMusicScoreAccompaniment();
+				record.setMusicPdfUrl(musicSheetApplication.getMusicPdfUrl());
+				record.setFirstPdfUrl(musicSheetApplication.getFirstPdfUrl());
+				record.setJianPdfUrl(musicSheetApplication.getJianPdfUrl());
 				record.setId(accompaniment.getExamSongId().toString());
 				record.setExamSongId(accompaniment.getExamSongId());
 				record.setMusicSheetType(musicSheetApplication.getMusicSheetType().getCode());
@@ -88,16 +91,16 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Strin
 				record.setMetronomeMp3Url(sound.getAudioFileUrl());
 				record.setTrack(sound.getTrack());
 				record.setXmlUrl(musicSheetApplication.getXmlFileUrl());
-				record.setMusicPdfUrl(sound.getMusicPdfUrl());
-				record.setFirstPdfUrl(sound.getFirstPdfUrl());
-				record.setJianPdfUrl(sound.getJianPdfUrl());
+				record.setSoundMusicPdfUrl(sound.getMusicPdfUrl());
+				record.setSoundFirstPdfUrl(sound.getFirstPdfUrl());
+				record.setSoundJianPdfUrl(sound.getJianPdfUrl());
 				List<CbsMusicSheetWrapper.MusicSheetAccompaniment> accompanimentList = musicSheetApplication.getMusicSheetAccompanimentList();
 				if (CollectionUtils.isNotEmpty(accompanimentList)) {
 					CbsMusicSheetWrapper.MusicSheetAccompaniment accompaniment1 = accompanimentList.get(0);
 					record.setMetronomeUrl(accompaniment1.getAudioFileUrl());
-					record.setMusicPdfUrl(accompaniment1.getMusicPdfUrl());
-					record.setFirstPdfUrl(accompaniment1.getFirstPdfUrl());
-					record.setJianPdfUrl(accompaniment1.getJianPdfUrl());
+					record.setAccMusicPdfUrl(accompaniment1.getMusicPdfUrl());
+					record.setAccFirstPdfUrl(accompaniment1.getFirstPdfUrl());
+					record.setAccJianPdfUrl(accompaniment1.getJianPdfUrl());
 				}
 				record.setMp3Url(sound.getAudioFileUrl());
 				record.setIsScoreRender(musicSheetApplication.getIsScoreRender());
@@ -139,6 +142,9 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Strin
 			List<SysMusicScoreAccompaniment> childAccompaniments = new ArrayList<>();
 			for (int i = 0; i < musicSheetApplication.getMusicSheetSoundList().size(); i++) {
 				SysMusicScoreAccompaniment record = new SysMusicScoreAccompaniment();
+				record.setMusicPdfUrl(musicSheetApplication.getMusicPdfUrl());
+				record.setFirstPdfUrl(musicSheetApplication.getFirstPdfUrl());
+				record.setJianPdfUrl(musicSheetApplication.getJianPdfUrl());
 				record.setIsConvertibleScore(musicSheetApplication.getIsConvertibleScore());
 				if(musicSheetApplication.getScoreType() != null){
 					record.setScoreType(musicSheetApplication.getScoreType().getCode());
@@ -163,9 +169,9 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Strin
 				record.setCategoriesName(musicSheetApplication.getMusicSheetCategoryName());
 				record.setSpeed(musicSheetApplication.getPlaySpeed());
 				CbsMusicSheetWrapper.MusicSheetSound sound = musicSheetApplication.getMusicSheetSoundList().get(i);
-				record.setMusicPdfUrl(sound.getMusicPdfUrl());
-				record.setFirstPdfUrl(sound.getFirstPdfUrl());
-				record.setJianPdfUrl(sound.getJianPdfUrl());
+				record.setSoundMusicPdfUrl(sound.getMusicPdfUrl());
+				record.setSoundFirstPdfUrl(sound.getFirstPdfUrl());
+				record.setSoundJianPdfUrl(sound.getJianPdfUrl());
 				record.setMetronomeMp3Url(sound.getAudioFileUrl());
 				record.setTrack(sound.getTrack());
 				record.setSubjectName(sound.getTrack());
@@ -175,11 +181,12 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Strin
 				record.setIsOpenMetronome(musicSheetApplication.getIsUseSystemBeat());
 				List<CbsMusicSheetWrapper.MusicSheetAccompaniment> accompanimentList = musicSheetApplication.getMusicSheetAccompanimentList();
 				if (CollectionUtils.isNotEmpty(accompanimentList)) {
-					record.setMetronomeUrl(accompanimentList.get(0).getAudioFileUrl());
-					record.setUrl(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.setUrl(accompaniment1.getAudioFileUrl());
+					record.setAccMusicPdfUrl(accompaniment1.getMusicPdfUrl());
+					record.setAccFirstPdfUrl(accompaniment1.getFirstPdfUrl());
+					record.setAccJianPdfUrl(accompaniment1.getJianPdfUrl());
 				}
 				record.setMetronomeMp3Url(sound.getAudioFileUrl());
 				record.setMp3Url(sound.getAudioFileUrl());

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

@@ -215,9 +215,9 @@ 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());
+        record.setMusicPdfUrl(musicSheetApplication.getMusicPdfUrl());
+        record.setFirstPdfUrl(musicSheetApplication.getFirstPdfUrl());
+        record.setJianPdfUrl(musicSheetApplication.getJianPdfUrl());
         List<CbsMusicSheetWrapper.MusicSheetAccompaniment> accompanimentList = musicSheetApplication.getMusicSheetAccompanimentList();
         if (CollectionUtils.isNotEmpty(accompanimentList)) {
             CbsMusicSheetWrapper.MusicSheetAccompaniment accompaniment = accompanimentList.get(0);