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

# Conflicts:
#	pom.xml

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

@@ -1,5 +1,6 @@
 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;
@@ -106,6 +107,12 @@ public class SysMusicScoreAccompaniment {
 	@ApiModelProperty("谱面类型")
 	private String scoreType;
 
+	@ApiModelProperty("是否总谱渲染")
+	private Boolean isScoreRender;
+
+	@ApiModelProperty("演奏是否默认展示总谱渲染")
+	private Boolean defaultScoreRender;
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -119,6 +119,8 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Strin
 				record.setMetronomeMp3Url(sound.getAudioFileUrl());
 				record.setMp3Url(sound.getAudioFileUrl());
 				record.setIsShowFingering(musicSheetApplication.getIsShowFingering());
+				record.setIsScoreRender(musicSheetApplication.getIsScoreRender());
+				record.setDefaultScoreRender(musicSheetApplication.getDefaultScoreRender());
 				childAccompaniments.add(record);
 			}
 			result.addAll(childAccompaniments);
@@ -176,6 +178,8 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Strin
 			record.setMetronomeUrl(musicSheetApplication.getUrl());
 			record.setUrl(musicSheetApplication.getUrl());
 			record.setIsShowFingering(musicSheetApplication.getIsShowFingering());
+			record.setIsScoreRender(musicSheetApplication.getIsScoreRender());
+			record.setDefaultScoreRender(musicSheetApplication.getDefaultScoreRender());
 			result.add(record);
 		}
 		return result;
@@ -216,6 +220,8 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Strin
 		record.setMetronomeMp3Url(musicSheetApplication.getMp3Url());
 		record.setMp3Url(musicSheetApplication.getMp3Url());
 		record.setIsShowFingering(musicSheetApplication.getIsShowFingering());
+		record.setIsScoreRender(musicSheetApplication.getIsScoreRender());
+		record.setDefaultScoreRender(musicSheetApplication.getDefaultScoreRender());
 		return record;
 	}
 

mec-im/src/main/java/com/ym/pojo/MusicScoreMessage.java

@@ -20,7 +20,7 @@ public class MusicScoreMessage {
     private String mp3Url = "";
 
     /** 速度 */
-    private Integer speed;
+    private String speed;
 
     /**  */
     private String xmlUrl = "";

pom.xml

@@ -25,7 +25,7 @@
 		<docker.host>http://127.0.0.1:2375</docker.host>
 		<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.7</com.microsvc.toolkit.version>
+		<com.microsvc.toolkit.version>1.0.8</com.microsvc.toolkit.version>
 		<cbs.version>1.0.13</cbs.version>
 	</properties>