Merge remote-tracking branch 'origin/master'

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/MusicSheet.java

@@ -118,6 +118,21 @@ public class MusicSheet implements Serializable {
     @ApiModelProperty(value = "XML文件存储路径")
     private String xmlFileUrl;  //XML文件存储路径
 
+
+	@TableField("midi_url_")
+	@ApiModelProperty(value = "midi路径")
+	private String midiUrl;  //XML文件存储路径
+
+
+	@TableField("metronome_url_")
+	@ApiModelProperty(value = "伴奏含节拍器路径")
+	private String metronomeUrl;  //XML文件存储路径
+
+
+	@TableField("url_")
+	@ApiModelProperty(value = "伴奏（不含节拍器）路径")
+	private String url;  //XML文件存储路径
+
     @TableField("has_beat_")
     @ApiModelProperty(value = "是否自带节拍器(0:否;1:是)")
     private YesOrNoEnum hasBeat;  //是否自带节拍器(0:否;1:是)
@@ -147,6 +162,30 @@ public class MusicSheet implements Serializable {
 	@ApiModelProperty(value = "假删除标识 0：未删除 1：已删除")
 	private Boolean delFlag;
 
+	public String getMidiUrl() {
+		return midiUrl;
+	}
+
+	public void setMidiUrl(String midiUrl) {
+		this.midiUrl = midiUrl;
+	}
+
+	public String getMetronomeUrl() {
+		return metronomeUrl;
+	}
+
+	public void setMetronomeUrl(String metronomeUrl) {
+		this.metronomeUrl = metronomeUrl;
+	}
+
+	public String getUrl() {
+		return url;
+	}
+
+	public void setUrl(String url) {
+		this.url = url;
+	}
+
 	public Long getId() {
 		return id;
 	}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/MusicSheetAccompaniment.java

@@ -34,6 +34,14 @@ public class MusicSheetAccompaniment extends BaseEntity {
     @ApiModelProperty(value = "MP3原声音频文件URL")
     private String audioFileUrl;  //MP3原声音频文件URL
 
+	@TableField("metronome_url_")
+	@ApiModelProperty(value = "MP3节拍器伴奏")
+	private String metronomeUrl;  //MP3原声音频文件URL
+
+	@TableField("track_")
+	@ApiModelProperty(value = "类型")
+	private String track;  //MP3原声音频文件URL
+
     @TableField("sort_number_")
     @ApiModelProperty(value = "排序号")
     private Integer sortNumber;  //排序号
@@ -52,6 +60,22 @@ public class MusicSheetAccompaniment extends BaseEntity {
 	    return this;
 	}
 
+	public String getMetronomeUrl() {
+		return metronomeUrl;
+	}
+
+	public void setMetronomeUrl(String metronomeUrl) {
+		this.metronomeUrl = metronomeUrl;
+	}
+
+	public String getTrack() {
+		return track;
+	}
+
+	public void setTrack(String track) {
+		this.track = track;
+	}
+
 	public Long getId() {
 	    return this.id;
 	}

cooleshow-user/user-biz/src/main/resources/config/mybatis/MusicSheetMapper.xml

@@ -157,12 +157,17 @@
     <select id="detail" resultMap="DetailResultMap">
         SELECT
         <include refid="Base_Column_List"/>
+        ,t.url_ as url
+        ,t.midi_url_ as midiUrl
+        ,t.metronome_url_ as metronomeUrl
         ,msa.id_ as accompanimentId
         ,msa.music_sheet_id_ as accompanimentMusicSheetId
         ,msa.music_subject_ as accompanimentMusicSubject
         ,msa.audio_file_url_ as accompanimentAudioFileUrl
         ,msa.sort_number_ as accompanimentSortNumber
         ,msa.create_time_ as accompanimentCreateTime
+        ,msa.metronome_url_ as accompanimentMetronomeUrl
+        ,msa.track_ as track
         ,su.username_ as userName
         ,(select group_concat(mt.name_) from music_tag mt
         where find_in_set(mt.id_,t.music_tag_) and mt.del_flag_ = 0) as musicTagNames
@@ -203,6 +208,9 @@
         <result column="updateTime" jdbcType="TIMESTAMP" property="updateTime"/>
         <result column="updateBy" jdbcType="BIGINT" property="updateBy"/>
         <result column="delFlag" jdbcType="BOOLEAN" property="delFlag"/>
+        <result column="url" jdbcType="BOOLEAN" property="url"/>
+        <result column="metronomeUrl" jdbcType="BOOLEAN" property="metronomeUrl"/>
+        <result column="midiUrl" jdbcType="BOOLEAN" property="midiUrl"/>
         <result column="remark" jdbcType="VARCHAR" property="remark"/>
         <result column="userName" jdbcType="VARCHAR" property="userName"/>
         <collection property="background" ofType="com.yonge.cooleshow.biz.dal.entity.MusicSheetAccompaniment">
@@ -212,6 +220,8 @@
             <result column="accompanimentAudioFileUrl" jdbcType="VARCHAR" property="audioFileUrl"/>
             <result column="accompanimentSortNumber" jdbcType="TINYINT" property="sortNumber"/>
             <result column="accompanimentCreateTime" jdbcType="TIMESTAMP" property="createTime"/>
+            <result column="accompanimentMetronomeUrl" jdbcType="VARCHAR" property="metronomeUrl"/>
+            <result column="track" jdbcType="VARCHAR" property="track"/>
         </collection>
     </resultMap>