音频空白标记

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

@@ -1,7 +1,5 @@
 package com.ym.mec.biz.dal.entity;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.dayaedu.cbs.common.enums.school.EMusicSheetType;
 import com.ym.mec.biz.dal.entity.SysMusicScore.PlayMode;
 import com.ym.mec.biz.dal.enums.ClientTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
@@ -135,6 +133,9 @@ public class SysMusicScoreAccompaniment {
 	@ApiModelProperty("原音固定调PDF文件")
 	private String soundJianPdfUrl;
 
+	@ApiModelProperty("原音音频空白标记")
+	private Boolean soundMp3HeadGap;
+
 	@ApiModelProperty("伴奏五线谱PDF文件")
 	private String accMusicPdfUrl;
 
@@ -144,6 +145,9 @@ public class SysMusicScoreAccompaniment {
 	@ApiModelProperty("伴奏固定调PDF文件")
 	private String accJianPdfUrl;
 
+	@ApiModelProperty("伴奏音频空白标记")
+	private Boolean accMp3HeadGap;
+
 	@ApiModelProperty("五线谱图片")
 	private String musicImg;
 
@@ -156,6 +160,9 @@ public class SysMusicScoreAccompaniment {
 	@ApiModelProperty("使用状态 试用： FREE 锁定： LOCK 解锁：UNLOCK")
 	private String useStatus;
 
+	@ApiModelProperty("音频空白标记")
+	private Boolean mp3HeadGap;
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -471,6 +471,9 @@ public class MusicSheetWrapper {
         @ApiModelProperty("总谱固定调PDF文件")
         private String jianPdfUrl;
 
+        @ApiModelProperty("音频空白标记")
+        private Boolean mp3HeadGap;
+
         @ApiModelProperty("曲目伴奏")
         private List<CbsMusicSheetWrapper.MusicSheetAccompaniment> musicSheetAccompanimentList;
 

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

@@ -191,6 +191,7 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Strin
 				record.setMusicPdfUrl(musicSheetApplication.getMusicPdfUrl());
 				record.setFirstPdfUrl(musicSheetApplication.getFirstPdfUrl());
 				record.setJianPdfUrl(musicSheetApplication.getJianPdfUrl());
+				record.setMp3HeadGap(musicSheetApplication.getMp3HeadGap());
 
 				// 设置五线谱、首调、固定调谱面图片
 				record.musicImg(musicSheetApplication.getMusicImg())
@@ -229,6 +230,7 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Strin
 				record.setSoundFirstPdfUrl(sound.getFirstPdfUrl());
 				record.setSoundJianPdfUrl(sound.getJianPdfUrl());
 				record.setMetronomeMp3Url(sound.getAudioFileUrl());
+				record.setSoundMp3HeadGap(sound.getMp3HeadGap());
 				record.setTrack(sound.getTrack());
 				record.setSubjectName(sound.getTrack());
 				record.setXmlUrl(musicSheetApplication.getXmlFileUrl());
@@ -243,6 +245,7 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Strin
 					record.setAccMusicPdfUrl(accompaniment1.getMusicPdfUrl());
 					record.setAccFirstPdfUrl(accompaniment1.getFirstPdfUrl());
 					record.setAccJianPdfUrl(accompaniment1.getJianPdfUrl());
+					record.setAccMp3HeadGap(accompaniment1.getMp3HeadGap());
 				}
 				record.setMetronomeMp3Url(sound.getAudioFileUrl());
 				record.setMp3Url(sound.getAudioFileUrl());
@@ -296,6 +299,7 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Strin
 			record.setExamSongName(musicSheetApplication.getName());
 			record.setCategoriesName(musicSheetApplication.getMusicSheetCategoryName());
 			record.setSpeed(musicSheetApplication.getPlaySpeed());
+			record.setMp3HeadGap(musicSheetApplication.getMp3HeadGap());
 			//原音
 			record.setMetronomeMp3Url(musicSheetApplication.getMp3Url());
 			record.setMp3Url(musicSheetApplication.getMp3Url());
@@ -305,12 +309,14 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Strin
 			record.setMidiUrl(musicSheetApplication.getMidiFileUrl());
 			record.setEnableEvaluation(musicSheetApplication.getIsEvaluated());
 			record.setIsOpenMetronome(musicSheetApplication.getIsUseSystemBeat());
+			record.setSoundMp3HeadGap(musicSheetApplication.getSoundMp3HeadGap());
 			//伴奏
 			record.setMetronomeUrl(musicSheetApplication.getUrl());
 			record.setUrl(musicSheetApplication.getUrl());
 			record.setIsShowFingering(musicSheetApplication.getIsShowFingering());
 			record.setIsScoreRender(musicSheetApplication.getIsScoreRender());
 			record.setDefaultScoreRender(musicSheetApplication.getDefaultScoreRender());
+			record.setAccMp3HeadGap(musicSheetApplication.getAccMp3HeadGap());
 			result.add(record);
 		}
 		return result;
@@ -353,6 +359,9 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Strin
 		record.setIsShowFingering(musicSheetApplication.getIsShowFingering());
 		record.setIsScoreRender(musicSheetApplication.getIsScoreRender());
 		record.setDefaultScoreRender(musicSheetApplication.getDefaultScoreRender());
+		record.setMp3HeadGap(musicSheetApplication.getMp3HeadGap());
+		record.setSoundMp3HeadGap(musicSheetApplication.getSoundMp3HeadGap());
+		record.setAccMp3HeadGap(musicSheetApplication.getAccMp3HeadGap());
 		return record;
 	}
 

mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

@@ -2753,10 +2753,10 @@ public class RoomServiceImpl implements RoomService {
                         courseScheduleId, null, null, 0);
         //获取曲目信息
         CbsMusicSheetWrapper.MusicSheetAccApplication sheetApplication = this.getSheetApplication(musicScoreData.getMusicScoreAccompanimentId());
-        if (scheduleStudentMusicScores.size() == 0) {
+        if (CollectionUtils.isEmpty(scheduleStudentMusicScores)) {
             //第一次下载,生成数据
             List<CourseScheduleStudentPayment> courseScheduleStudentPayments = courseScheduleStudentPaymentDao.findByCourseSchedule(courseScheduleId);
-            Set<Integer> studentIds = courseScheduleStudentPayments.stream().map(e -> e.getUserId()).collect(Collectors.toSet());
+            Set<Integer> studentIds = courseScheduleStudentPayments.stream().map(CourseScheduleStudentPayment::getUserId).collect(Collectors.toSet());
             studentIds.forEach(e -> {
                 CourseScheduleStudentMusicScore musicScore = new CourseScheduleStudentMusicScore();
                 musicScore.setMusicScoreAccompanimentId(musicScoreData.getMusicScoreAccompanimentId());

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-RC1</com.microsvc.toolkit.version>
-		<cbs.version>1.0.23</cbs.version>
+		<cbs.version>1.0.25</cbs.version>
 	</properties>
 
 	<dependencyManagement>