Merge branch 'zx_saas_config_0920' of http://git.dayaedu.com/yonge/mec into dev

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

@@ -151,6 +151,9 @@ public class SysMusicScore {
 	@ApiModelProperty("是否支持混音节拍器")
 	private Boolean isMixBeat;
 
+	@ApiModelProperty("简谱谱面样式参数设置")
+	private String extJianStyleConfigJson;
+
 	@ApiModelProperty("总谱五线谱PDF文件")
 	private String musicPdfUrl;
 

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

@@ -116,6 +116,9 @@ public class SysMusicScoreAccompaniment {
 	@ApiModelProperty("是否支持混音节拍器")
 	private Boolean isMixBeat;
 
+	@ApiModelProperty("简谱谱面样式参数设置")
+	private String extJianStyleConfigJson;
+
 	@ApiModelProperty("总谱五线谱PDF文件")
 	private String musicPdfUrl;
 

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

@@ -105,6 +105,7 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Strin
 				record.setFirstPdfUrl(musicSheetApplication.getFirstPdfUrl());
 				record.setJianPdfUrl(musicSheetApplication.getJianPdfUrl());
 				record.setIsMixBeat(musicSheetApplication.getIsMixBeat());
+				record.setExtJianStyleConfigJson(musicSheetApplication.getExtJianStyleConfigJson());
 				record.setId(accompaniment.getExamSongId().toString());
 				record.setExamSongId(accompaniment.getExamSongId());
 				record.setMusicSheetType(musicSheetApplication.getMusicSheetType().getCode());
@@ -168,6 +169,7 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Strin
 				record.setFirstPdfUrl(musicSheetApplication.getFirstPdfUrl());
 				record.setJianPdfUrl(musicSheetApplication.getJianPdfUrl());
 				record.setIsMixBeat(musicSheetApplication.getIsMixBeat());
+				record.setExtJianStyleConfigJson(musicSheetApplication.getExtJianStyleConfigJson());
 				record.setIsConvertibleScore(musicSheetApplication.getIsConvertibleScore());
 				if(musicSheetApplication.getScoreType() != null){
 					record.setScoreType(musicSheetApplication.getScoreType().getCode());

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

@@ -215,6 +215,7 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
         record.setSpeed(musicSheetApplication.getPlaySpeed());
         record.setIsOpenMetronome(musicSheetApplication.getIsUseSystemBeat());
         record.setIsMixBeat(musicSheetApplication.getIsMixBeat());
+        record.setExtJianStyleConfigJson(musicSheetApplication.getExtJianStyleConfigJson());
         record.setMusicPdfUrl(musicSheetApplication.getMusicPdfUrl());
         record.setFirstPdfUrl(musicSheetApplication.getFirstPdfUrl());
         record.setJianPdfUrl(musicSheetApplication.getJianPdfUrl());

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.16</cbs.version>
+		<cbs.version>1.0.17</cbs.version>
 	</properties>
 
 	<dependencyManagement>