Browse Source

是否支持混音节拍器

zouxuan 1 week ago
parent
commit
16fc51f27a

+ 9 - 0
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/MusicSheet.java

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

+ 3 - 0
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/CourseCoursewareServiceImpl.java

@@ -85,6 +85,9 @@ public class CourseCoursewareServiceImpl extends ServiceImpl<CourseCoursewareDao
                     record.setStatus(sheetApplication.getStatus()?YesOrNoEnum.YES:YesOrNoEnum.NO);
                     record.setMusicStatus(sheetApplication.getStatus()?YesOrNoEnum.YES:YesOrNoEnum.NO);
                     record.setIsMixBeat(sheetApplication.getIsMixBeat());
+                    record.setMusicPdfUrl(sheetApplication.getMusicPdfUrl());
+                    record.setFirstPdfUrl(sheetApplication.getFirstPdfUrl());
+                    record.setJianPdfUrl(sheetApplication.getJianPdfUrl());
                     List<CbsMusicSheetWrapper.MusicSheetAccompaniment> accompanimentList = sheetApplication.getMusicSheetAccompanimentList();
                     if(CollectionUtils.isNotEmpty(accompanimentList)){
                         CbsMusicSheetWrapper.MusicSheetAccompaniment accompaniment = accompanimentList.get(0);

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

@@ -465,6 +465,9 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         detailVo.setTitleImg(musicSheet1.getMusicCover());
         detailVo.setPlaySpeed(musicSheet1.getPlaySpeed());
         detailVo.setIsMixBeat(musicSheet1.getIsMixBeat());
+        detailVo.setMusicPdfUrl(musicSheet1.getMusicPdfUrl());
+        detailVo.setFirstPdfUrl(musicSheet1.getFirstPdfUrl());
+        detailVo.setJianPdfUrl(musicSheet1.getJianPdfUrl());
         List<CbsMusicSheetWrapper.MusicSheetAccompaniment> accompanimentList = musicSheet1.getMusicSheetAccompanimentList();
         if (CollectionUtils.isNotEmpty(accompanimentList)) {
             CbsMusicSheetWrapper.MusicSheetAccompaniment accompaniment = accompanimentList.get(0);

+ 3 - 0
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TenantAlbumMusicServiceImpl.java

@@ -158,6 +158,9 @@ public class TenantAlbumMusicServiceImpl extends ServiceImpl<TenantAlbumMusicMap
                     m.setFirstTone(sheetApplication.getMusicFirstImg());
                     m.setFixedTone(sheetApplication.getMusicJianImg());
                     m.setIsMixBeat(sheetApplication.getIsMixBeat());
+                    m.setMusicPdfUrl(sheetApplication.getMusicPdfUrl());
+                    m.setFirstPdfUrl(sheetApplication.getFirstPdfUrl());
+                    m.setJianPdfUrl(sheetApplication.getJianPdfUrl());
 
                     // 设置曲目原音
                     List<CbsMusicSheetWrapper.MusicSheetSound> soundList = sheetApplication.getMusicSheetSoundList();

+ 9 - 0
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/CourseCoursewareVo.java

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

+ 9 - 0
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/TenantAlbumMusicWrapper.java

@@ -278,6 +278,15 @@ public class TenantAlbumMusicWrapper {
         @ApiModelProperty("是否支持混音节拍器")
         private Boolean isMixBeat;
 
+        @ApiModelProperty("总谱五线谱PDF文件")
+        private String musicPdfUrl;
+
+        @ApiModelProperty("总谱首调PDF文件")
+        private String firstPdfUrl;
+
+        @ApiModelProperty("总谱固定调PDF文件")
+        private String jianPdfUrl;
+
         @ApiModelProperty("曲谱伴奏")
         private List<MusicSheetAccompaniment> background;