混音节拍器

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

@@ -148,6 +148,27 @@ public class SysMusicScore {
 	@ApiModelProperty("是否节奏练习")
 	private Boolean isAllSubject;
 
+	@ApiModelProperty("是否支持混音节拍器")
+	private Boolean isMixBeat;
+
+	@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;
+
 	private List<SysMusicScoreAccompaniment> background;
 
 	@Override

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

@@ -113,6 +113,15 @@ public class SysMusicScoreAccompaniment {
 	@ApiModelProperty("演奏是否默认展示总谱渲染")
 	private Boolean defaultScoreRender;
 
+	@ApiModelProperty("五线谱PDF文件")
+	private String musicPdfUrl;
+
+	@ApiModelProperty("首调PDF文件")
+	private String firstPdfUrl;
+
+	@ApiModelProperty("固定调PDF文件")
+	private String jianPdfUrl;
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -88,9 +88,15 @@ 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());
 				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());
 				}
 				record.setMp3Url(sound.getAudioFileUrl());
 				record.setIsScoreRender(musicSheetApplication.getIsScoreRender());
@@ -136,6 +142,7 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Strin
 				if(musicSheetApplication.getScoreType() != null){
 					record.setScoreType(musicSheetApplication.getScoreType().getCode());
 				}
+
 				record.setId(accompaniment.getExamSongId().toString());
 				record.setType(accompaniment.getType());
 				record.setRankIds("FREE".equals(musicSheetApplication.getPaymentType()) ? null : "1");
@@ -155,6 +162,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.setMetronomeMp3Url(sound.getAudioFileUrl());
 				record.setTrack(sound.getTrack());
 				record.setSubjectName(sound.getTrack());
@@ -166,6 +176,9 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Strin
 				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());
 				}
 				record.setMetronomeMp3Url(sound.getAudioFileUrl());
 				record.setMp3Url(sound.getAudioFileUrl());

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

@@ -218,11 +218,17 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
         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());
         }
         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());
         }
         record.setXmlUrl(musicSheetApplication.getXmlFileUrl());
         record.setMidiUrl(musicSheetApplication.getMidiFileUrl());

pom.xml

@@ -26,7 +26,7 @@
 		<docker.registry.repository>127.0.0.1:5000</docker.registry.repository>
 		<docker.maven.plugin.version>1.2.2</docker.maven.plugin.version>
 		<com.microsvc.toolkit.version>1.0.8</com.microsvc.toolkit.version>
-		<cbs.version>1.0.15</cbs.version>
+		<cbs.version>1.0.16</cbs.version>
 	</properties>
 
 	<dependencyManagement>