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

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

@@ -31,6 +31,8 @@ public class SysMusicScore {
 		
 	}
 
+	private String extConfigJson;
+
 	/**  */
 	private Integer id;
 	
@@ -114,6 +116,14 @@ public class SysMusicScore {
 
 	private String organName;
 
+	public String getExtConfigJson() {
+		return extConfigJson;
+	}
+
+	public void setExtConfigJson(String extConfigJson) {
+		this.extConfigJson = extConfigJson;
+	}
+
 	public Integer getSubjectId() {
 		return subjectId;
 	}

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

@@ -87,6 +87,16 @@ public class SysMusicScoreAccompaniment {
 	
 	private String track;
 
+	private String extConfigJson;
+
+	public String getExtConfigJson() {
+		return extConfigJson;
+	}
+
+	public void setExtConfigJson(String extConfigJson) {
+		this.extConfigJson = extConfigJson;
+	}
+
 	public String getMetronomeUrl() {
 		return metronomeUrl;
 	}

mec-biz/src/main/resources/config/mybatis/SysMusicScoreAccompanimentMapper.xml

@@ -37,6 +37,7 @@
 		<result column="muse_score_url_" property="museScoreUrl" />
 		<result column="muse_score_memo_" property="museScoreMemo" />
 		<result column="track_" property="track" />
+		<result column="ext_config_json_" property="extConfigJson" />
 	</resultMap>
 
 	<delete id="deleteBySongId">
@@ -144,7 +145,7 @@
 		SELECT
 		    sesa.*,ses.name_,ses.type_,ses.url_,
 		       s.name_ subject_name_,sesc.name_ categories_name_,sesc.id_ categories_id_,sesc.parent_id_ parent_categories_id_,ses.client_type_,
-		ses.rank_ids_,ses.render_from_,ses.enable_evaluation_,ses.metronome_url_,ses.midi_url_,ses.play_mode_,ses.render_from_
+		ses.rank_ids_,ses.render_from_,ses.enable_evaluation_,ses.metronome_url_,ses.midi_url_,ses.play_mode_,ses.render_from_,ses.ext_config_json_
 		FROM sys_music_score ses
 		LEFT JOIN sys_music_score_accompaniment sesa ON ses.id_ = sesa.exam_song_id_
 		LEFT JOIN sys_music_score_categories sesc ON sesc.id_ = ses.music_score_categories_id_
@@ -180,7 +181,7 @@
 	</select>
 	<select id="queryAccPage" resultMap="SysMusicScoreAccompaniment">
 		SELECT sesa.*,ses.name_,ses.type_,ses.url_,s.name_ subject_name_,sesc.name_ categories_name_,sesc.id_ categories_id_,sesc.parent_id_ parent_categories_id_,ses.client_type_,
-		ses.enable_evaluation_,ses.metronome_url_,ses.midi_url_,ses.play_mode_,ses.render_from_
+		ses.enable_evaluation_,ses.metronome_url_,ses.midi_url_,ses.play_mode_,ses.render_from_,ses.ext_config_json_
 		FROM sys_music_score ses
 		LEFT JOIN sys_music_score_accompaniment sesa ON ses.id_ = sesa.exam_song_id_
 		LEFT JOIN sys_music_score_categories sesc ON sesc.id_ = ses.music_score_categories_id_

mec-biz/src/main/resources/config/mybatis/SysMusicScoreMapper.xml

@@ -37,6 +37,7 @@
 		<result column="client_type_" property="clientType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
 		<result column="update_time_" property="updateTime" />
 		<result column="create_time_" property="createTime" />
+		<result column="ext_config_json_" property="extConfigJson" />
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -68,6 +69,7 @@
 			<if test="clientType != null">
 				client_type_ = #{clientType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 			</if>
+				ext_config_json_ = #{extConfigJson},
 				rank_ids_ = #{rankIds},
 			<if test="renderFrom != null">
 				render_from_ = #{renderFrom},

mec-web/src/main/java/com/ym/mec/web/controller/SysMusicScoreController.java

@@ -1,17 +1,5 @@
 package com.ym.mec.web.controller;
 
-import com.ym.mec.biz.dal.dto.SysMusicScoreTranscod;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import com.ym.mec.biz.dal.dao.SysMusicScoreCategoriesDao;
 import com.ym.mec.biz.dal.dto.MusicScoreDto;
 import com.ym.mec.biz.dal.entity.SysMusicScore;
 import com.ym.mec.biz.dal.entity.SysMusicScoreCategories;
@@ -22,6 +10,14 @@ import com.ym.mec.biz.service.SysMusicScoreCategoriesService;
 import com.ym.mec.biz.service.SysMusicScoreService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.exception.BizException;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.List;
 
 @RequestMapping("sysMusicScore")
 @Api(tags = "曲库")
@@ -31,8 +27,6 @@ public class SysMusicScoreController extends BaseController {
     @Autowired
     private SysMusicScoreService sysMusicScoreService;
     @Autowired
-    private SysMusicScoreCategoriesDao sysMusicScoreCategoriesDao;
-    @Autowired
     private OrganizationService organizationService;
     @Autowired
     private SysMusicScoreCategoriesService sysMusicScoreCategoriesService;