Merge branch 'vip_price_827'

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

@@ -2,12 +2,36 @@ package com.ym.mec.biz.dal.entity;
 
 import com.ym.mec.biz.dal.enums.ClientTypeEnum;
 import com.ym.mec.biz.dal.enums.ExamSongTypeEnum;
+import com.ym.mec.common.enums.AccessSource;
+import com.ym.mec.common.enums.BaseEnum;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
  * 对应数据库表(sys_music_score):
  */
 public class SysMusicScore {
+	
+	public enum PlayMode  implements BaseEnum<String, PlayMode> {
+		
+		MP3("MP3播放"),XML("XML播放");
+		
+		private String desc;
+		
+		private PlayMode(String desc) {
+			this.desc = desc;
+		}
+
+		@Override
+		public String getCode() {
+			return this.name();
+		}
+
+		public String getDesc() {
+			return desc;
+		}
+		
+	}
 
 	/**  */
 	private Integer id;
@@ -79,6 +103,12 @@ public class SysMusicScore {
 	private Integer showFlag = 0;
 
 	private Boolean isOpenMetronome;
+	
+	private String museScoreUrl;
+	
+	private String museScoreMemo;
+	
+	private PlayMode playMode;
 
 	private String organName;
 
@@ -114,6 +144,14 @@ public class SysMusicScore {
 		this.isOpenMetronome = isOpenMetronome;
 	}
 
+	public PlayMode getPlayMode() {
+		return playMode;
+	}
+
+	public void setPlayMode(PlayMode playMode) {
+		this.playMode = playMode;
+	}
+
 	public String getAccompanimentUrl() {
 		return accompanimentUrl;
 	}
@@ -298,6 +336,22 @@ public class SysMusicScore {
 		return this.createTime;
 	}
 
+	public String getMuseScoreUrl() {
+		return museScoreUrl;
+	}
+
+	public void setMuseScoreUrl(String museScoreUrl) {
+		this.museScoreUrl = museScoreUrl;
+	}
+
+	public String getMuseScoreMemo() {
+		return museScoreMemo;
+	}
+
+	public void setMuseScoreMemo(String museScoreMemo) {
+		this.museScoreMemo = museScoreMemo;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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.ym.mec.biz.dal.entity.SysMusicScore.PlayMode;
 import com.ym.mec.biz.dal.enums.ClientTypeEnum;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -76,6 +77,12 @@ public class SysMusicScoreAccompaniment {
 	private String renderFrom;
 	
 	private boolean enableEvaluation;
+	
+	private String museScoreUrl;
+	
+	private String museScoreMemo;
+	
+	private PlayMode playMode;
 
 	public String getMetronomeUrl() {
 		return metronomeUrl;
@@ -277,6 +284,30 @@ public class SysMusicScoreAccompaniment {
 		this.metronomeMp3Url = metronomeMp3Url;
 	}
 
+	public String getMuseScoreUrl() {
+		return museScoreUrl;
+	}
+
+	public void setMuseScoreUrl(String museScoreUrl) {
+		this.museScoreUrl = museScoreUrl;
+	}
+
+	public String getMuseScoreMemo() {
+		return museScoreMemo;
+	}
+
+	public void setMuseScoreMemo(String museScoreMemo) {
+		this.museScoreMemo = museScoreMemo;
+	}
+
+	public PlayMode getPlayMode() {
+		return playMode;
+	}
+
+	public void setPlayMode(PlayMode playMode) {
+		this.playMode = playMode;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -32,6 +32,9 @@
 		<result column="render_from_" property="renderFrom" />
 		<result column="enable_evaluation_" property="enableEvaluation" />
 		<result column="client_type_" property="clientType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+		<result column="play_mode_" property="playMode" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler" />
+		<result column="muse_score_url_" property="museScoreUrl" />
+		<result column="muse_score_memo_" property="museScoreMemo" />
 	</resultMap>
 
 	<delete id="deleteBySongId">
@@ -128,7 +131,8 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="SysMusicScoreAccompaniment" parameterType="map">
-		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_
+		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.muse_score_url_,ses.muse_score_memo_,ses.play_mode_
 		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_
@@ -163,7 +167,8 @@
 		</where>
 	</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_
+		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.muse_score_url_,ses.muse_score_memo_,ses.play_mode_
 		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

@@ -29,6 +29,9 @@
 		<result column="render_from_" property="renderFrom" />
 		<result column="enable_evaluation_" property="enableEvaluation" />
 		<result column="subject_id_" property="subjectId" />
+		<result column="play_mode_" property="playMode" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler" />
+		<result column="muse_score_url_" property="museScoreUrl" />
+		<result column="muse_score_memo_" property="museScoreMemo" />
 		<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" />
@@ -47,10 +50,10 @@
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.SysMusicScore" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO sys_music_score (music_score_categories_id_,name_,type_,speed_,url_,metronome_url_,create_user_id_,order_,
-		                             update_time_,create_time_,client_type_,rank_ids_,render_from_,enable_evaluation_,show_flag_)
+		                             update_time_,create_time_,client_type_,rank_ids_,render_from_,enable_evaluation_,show_flag_,play_mode_,muse_score_url_,muse_score_memo_)
 		VALUES(#{musicScoreCategoriesId},#{name},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 		       #{speed},#{url},#{metronomeUrl},#{createUserId},#{order},NOW(),NOW(),#{clientType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-		       #{rankIds},#{renderFrom},#{enableEvaluation},#{showFlag})
+		       #{rankIds},#{renderFrom},#{enableEvaluation},#{showFlag},#{playMode},#{museScoreUrl},#{museScoreMemo})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -95,6 +98,15 @@
 		<if test="speed != null">
 			speed_ = #{speed},
 		</if>
+		<if test="playMode != null">
+			play_mode_ = #{playMode,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+		</if>
+		<if test="museScoreUrl != null">
+			muse_score_url_ = #{museScoreUrl},
+		</if>
+		<if test="museScoreMemo != null">
+			muse_score_memo_ = #{museScoreMemo},
+		</if>
 			update_time_ = NOW()
 	</set>
 		WHERE id_ = #{id}

mec-common/common-core/src/main/java/com/ym/mec/common/dal/CustomEnumTypeHandler.java

@@ -50,6 +50,9 @@ public class CustomEnumTypeHandler extends BaseTypeHandler<BaseEnum> {
 			return null;
 		}
 		Object code = null;
+		if(type == null){
+			return null;
+		}
 		for (BaseEnum enumBaseInterface : type.getEnumConstants()) {
 
 			code = enumBaseInterface.getCode();