update

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/AlbumFavoriteDao.java

@@ -0,0 +1,9 @@
+package com.yonge.cooleshow.biz.dal.dao;
+
+import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.cooleshow.biz.dal.entity.AlbumFavorite;
+
+public interface AlbumFavoriteDao extends BaseDAO<Long, AlbumFavorite> {
+
+	
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/MusicFavoriteDao.java

@@ -0,0 +1,9 @@
+package com.yonge.cooleshow.biz.dal.dao;
+
+import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.cooleshow.biz.dal.entity.MusicFavorite;
+
+public interface MusicFavoriteDao extends BaseDAO<Long, MusicFavorite> {
+
+	
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/StudentFavoriteAlbumDao.java

@@ -1,9 +0,0 @@
-package com.yonge.cooleshow.biz.dal.dao;
-
-import com.yonge.cooleshow.common.dal.BaseDAO;
-import com.yonge.cooleshow.biz.dal.entity.StudentFavoriteAlbum;
-
-public interface StudentFavoriteAlbumDao extends BaseDAO<Long, StudentFavoriteAlbum> {
-
-	
-}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/StudentFavoriteMusicDao.java

@@ -1,9 +0,0 @@
-package com.yonge.cooleshow.biz.dal.dao;
-
-import com.yonge.cooleshow.common.dal.BaseDAO;
-import com.yonge.cooleshow.biz.dal.entity.StudentFavoriteMusic;
-
-public interface StudentFavoriteMusicDao extends BaseDAO<Long, StudentFavoriteMusic> {
-
-	
-}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/VideoLessonDao.java

@@ -1,9 +0,0 @@
-package com.yonge.cooleshow.biz.dal.dao;
-
-import com.yonge.cooleshow.common.dal.BaseDAO;
-import com.yonge.cooleshow.biz.dal.entity.VideoLesson;
-
-public interface VideoLessonDao extends BaseDAO<Long, VideoLesson> {
-
-	
-}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/VideoLessonDetailDao.java

@@ -1,9 +0,0 @@
-package com.yonge.cooleshow.biz.dal.dao;
-
-import com.yonge.cooleshow.common.dal.BaseDAO;
-import com.yonge.cooleshow.biz.dal.entity.VideoLessonDetail;
-
-public interface VideoLessonDetailDao extends BaseDAO<Long, VideoLessonDetail> {
-
-	
-}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/VideoLessonGroupDao.java

@@ -0,0 +1,9 @@
+package com.yonge.cooleshow.biz.dal.dao;
+
+import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.cooleshow.biz.dal.entity.VideoLessonGroup;
+
+public interface VideoLessonGroupDao extends BaseDAO<Long, VideoLessonGroup> {
+
+	
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/VideoLessonGroupDetailDao.java

@@ -0,0 +1,9 @@
+package com.yonge.cooleshow.biz.dal.dao;
+
+import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.cooleshow.biz.dal.entity.VideoLessonGroupDetail;
+
+public interface VideoLessonGroupDetailDao extends BaseDAO<Long, VideoLessonGroupDetail> {
+
+	
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/StudentFavoriteAlbum.java → cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/AlbumFavorite.java

@@ -4,15 +4,15 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import io.swagger.annotations.ApiModelProperty;
 
 /**
- * 对应数据库表(student_favorite_album):
+ * 对应数据库表(album_favorite):
  */
-public class StudentFavoriteAlbum {
+public class AlbumFavorite {
 
 	@ApiModelProperty(value = "主键",required = false)
 	private Long id;
 	
-	@ApiModelProperty(value = "学生ID",required = false)
-	private Long studentId;
+	@ApiModelProperty(value = "用户ID(目前只是学生ID)",required = false)
+	private Long userId;
 	
 	@ApiModelProperty(value = "专辑ID",required = false)
 	private Long albumId;
@@ -20,6 +20,9 @@ public class StudentFavoriteAlbum {
 	@ApiModelProperty(value = "收藏时间",required = false)
 	private java.util.Date favoriteTime;
 	
+	@ApiModelProperty(value = "是否收藏",required = false)
+	private boolean favoriteFlag;
+	
 	public void setId(Long id){
 		this.id = id;
 	}
@@ -28,12 +31,12 @@ public class StudentFavoriteAlbum {
 		return this.id;
 	}
 			
-	public void setStudentId(Long studentId){
-		this.studentId = studentId;
+	public void setUserId(Long userId){
+		this.userId = userId;
 	}
 	
-	public Long getStudentId(){
-		return this.studentId;
+	public Long getUserId(){
+		return this.userId;
 	}
 			
 	public void setAlbumId(Long albumId){
@@ -52,6 +55,14 @@ public class StudentFavoriteAlbum {
 		return this.favoriteTime;
 	}
 			
+	public void setFavoriteFlag(boolean favoriteFlag){
+		this.favoriteFlag = favoriteFlag;
+	}
+	
+	public boolean isFavoriteFlag(){
+		return this.favoriteFlag;
+	}
+			
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -18,13 +18,13 @@ public class AlbumMusicRelate {
 	private Long musicSheetId;
 	
 	@ApiModelProperty(value = "排序号",required = false)
-	private Integer orderNum;
+	private Integer sortNumber;
 	
 	@ApiModelProperty(value = "添加时间",required = false)
 	private java.util.Date createTime;
 	
 	@ApiModelProperty(value = "添加人",required = false)
-	private Long createUser;
+	private Long createBy;
 	
 	public void setId(Long id){
 		this.id = id;
@@ -50,12 +50,12 @@ public class AlbumMusicRelate {
 		return this.musicSheetId;
 	}
 			
-	public void setOrderNum(Integer orderNum){
-		this.orderNum = orderNum;
+	public void setSortNumber(Integer sortNumber){
+		this.sortNumber = sortNumber;
 	}
 	
-	public Integer getOrderNum(){
-		return this.orderNum;
+	public Integer getSortNumber(){
+		return this.sortNumber;
 	}
 			
 	public void setCreateTime(java.util.Date createTime){
@@ -66,12 +66,12 @@ public class AlbumMusicRelate {
 		return this.createTime;
 	}
 			
-	public void setCreateUser(Long createUser){
-		this.createUser = createUser;
+	public void setCreateBy(Long createBy){
+		this.createBy = createBy;
 	}
 	
-	public Long getCreateUser(){
-		return this.createUser;
+	public Long getCreateBy(){
+		return this.createBy;
 	}
 			
 	@Override

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

@@ -17,35 +17,35 @@ public class MusicAlbum {
 	@ApiModelProperty(value = "专辑简介",required = false)
 	private String albumDesc;
 	
-	@ApiModelProperty(value = "专辑标签",required = false)
+	@ApiModelProperty(value = "专辑标签(多个标签以逗号分开)",required = false)
 	private String albumTag;
 	
 	@ApiModelProperty(value = "专辑封面图片URL",required = false)
 	private String albumCoverUrl;
 	
-	@ApiModelProperty(value = "专辑状态(0:草稿;1:启用;2:停用)",required = false)
+	@ApiModelProperty(value = "专辑状态(1:启用;0:停用)",required = false)
 	private boolean albumStatus;
 	
 	@ApiModelProperty(value = "排序号",required = false)
-	private Integer orderNo;
+	private Integer sortNumber;
 	
-	@ApiModelProperty(value = "是否热门专辑",required = false)
+	@ApiModelProperty(value = "是否热门专辑(1:是;0:否)",required = false)
 	private boolean hotFlag;
 	
-	@ApiModelProperty(value = "是否置顶",required = false)
+	@ApiModelProperty(value = "是否置顶(1:是;0:否)",required = false)
 	private boolean topFlag;
 	
 	@ApiModelProperty(value = "创建时间",required = false)
 	private java.util.Date createTime;
 	
 	@ApiModelProperty(value = "创建人",required = false)
-	private Integer createUser;
+	private Long createBy;
 	
 	@ApiModelProperty(value = "更新时间",required = false)
 	private java.util.Date updateTime;
 	
 	@ApiModelProperty(value = "更新人",required = false)
-	private Integer updateUser;
+	private Long updateBy;
 	
 	public void setId(Long id){
 		this.id = id;
@@ -95,12 +95,12 @@ public class MusicAlbum {
 		return this.albumStatus;
 	}
 			
-	public void setOrderNo(Integer orderNo){
-		this.orderNo = orderNo;
+	public void setSortNumber(Integer sortNumber){
+		this.sortNumber = sortNumber;
 	}
 	
-	public Integer getOrderNo(){
-		return this.orderNo;
+	public Integer getSortNumber(){
+		return this.sortNumber;
 	}
 			
 	public void setHotFlag(boolean hotFlag){
@@ -127,12 +127,12 @@ public class MusicAlbum {
 		return this.createTime;
 	}
 			
-	public void setCreateUser(Integer createUser){
-		this.createUser = createUser;
+	public void setCreateBy(Long createBy){
+		this.createBy = createBy;
 	}
 	
-	public Integer getCreateUser(){
-		return this.createUser;
+	public Long getCreateBy(){
+		return this.createBy;
 	}
 			
 	public void setUpdateTime(java.util.Date updateTime){
@@ -143,12 +143,12 @@ public class MusicAlbum {
 		return this.updateTime;
 	}
 			
-	public void setUpdateUser(Integer updateUser){
-		this.updateUser = updateUser;
+	public void setUpdateBy(Long updateBy){
+		this.updateBy = updateBy;
 	}
 	
-	public Integer getUpdateUser(){
-		return this.updateUser;
+	public Long getUpdateBy(){
+		return this.updateBy;
 	}
 			
 	@Override

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/StudentFavoriteMusic.java → cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/MusicFavorite.java

@@ -4,22 +4,25 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import io.swagger.annotations.ApiModelProperty;
 
 /**
- * 对应数据库表(student_favorite_music):
+ * 对应数据库表(music_favorite):
  */
-public class StudentFavoriteMusic {
+public class MusicFavorite {
 
 	@ApiModelProperty(value = "主键",required = false)
 	private Long id;
 	
-	@ApiModelProperty(value = "学生ID",required = false)
-	private Long studentId;
+	@ApiModelProperty(value = "用户ID(目前只是学生ID)",required = false)
+	private Long userId;
 	
 	@ApiModelProperty(value = "曲谱ID",required = false)
-	private Long sheetId;
+	private Long musicSheetId;
 	
 	@ApiModelProperty(value = "收藏时间",required = false)
 	private java.util.Date favoriteTime;
 	
+	@ApiModelProperty(value = "是否收藏(1:收藏;0:取消收藏)",required = false)
+	private boolean favoriteFlag;
+	
 	public void setId(Long id){
 		this.id = id;
 	}
@@ -28,20 +31,20 @@ public class StudentFavoriteMusic {
 		return this.id;
 	}
 			
-	public void setStudentId(Long studentId){
-		this.studentId = studentId;
+	public void setUserId(Long userId){
+		this.userId = userId;
 	}
 	
-	public Long getStudentId(){
-		return this.studentId;
+	public Long getUserId(){
+		return this.userId;
 	}
 			
-	public void setSheetId(Long sheetId){
-		this.sheetId = sheetId;
+	public void setMusicSheetId(Long musicSheetId){
+		this.musicSheetId = musicSheetId;
 	}
 	
-	public Long getSheetId(){
-		return this.sheetId;
+	public Long getMusicSheetId(){
+		return this.musicSheetId;
 	}
 			
 	public void setFavoriteTime(java.util.Date favoriteTime){
@@ -52,6 +55,14 @@ public class StudentFavoriteMusic {
 		return this.favoriteTime;
 	}
 			
+	public void setFavoriteFlag(boolean favoriteFlag){
+		this.favoriteFlag = favoriteFlag;
+	}
+	
+	public boolean isFavoriteFlag(){
+		return this.favoriteFlag;
+	}
+			
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -12,30 +12,30 @@ public class MusicSheet {
 	private Long id;
 	
 	@ApiModelProperty(value = "曲谱名称",required = false)
-	private String musicName;
+	private String musicSheetName;
 	
 	@ApiModelProperty(value = "曲谱来源(0:平台;非0:老师ID)",required = false)
-	private Integer musicSource;
+	private Long userId;
 	
 	@ApiModelProperty(value = "作曲人",required = false)
 	private String composer;
 	
 	@ApiModelProperty(value = "曲谱声部(适用的乐器,可能是多个,用逗号分隔)",required = false)
-	private String musicInstrument;
+	private String musicSubject;
 	
 	@ApiModelProperty(value = "曲谱音频文件类型(midi;mp3)",required = false)
 	private String audioType;
 	
-	@ApiModelProperty(value = "曲谱标签(可以是多个标签,用逗号分隔)",required = false)
+	@ApiModelProperty(value = "曲谱标签(多个标签用逗号分隔)",required = false)
 	private String musicTag;
 	
 	@ApiModelProperty(value = "默认播放速度",required = false)
 	private Integer playSpeed;
 	
-	@ApiModelProperty(value = "是否可以评测",required = false)
+	@ApiModelProperty(value = "是否可以评测(0:否;1:是)",required = false)
 	private boolean canEvaluate;
 	
-	@ApiModelProperty(value = "是否展示指法",required = false)
+	@ApiModelProperty(value = "是否展示指法(0:否;1:是)",required = false)
 	private boolean showFingering;
 	
 	@ApiModelProperty(value = "收费类型(0:免费;1:会员;2:单曲收费)",required = false)
@@ -45,16 +45,16 @@ public class MusicSheet {
 	private boolean auditStatus;
 	
 	@ApiModelProperty(value = "排序号",required = false)
-	private Integer orderNo;
+	private Integer sortNumber;
 	
-	@ApiModelProperty(value = "是否置顶",required = false)
+	@ApiModelProperty(value = "是否置顶(0:否;1:是)",required = false)
 	private boolean topFlag;
 	
-	@ApiModelProperty(value = "是否热门曲谱",required = false)
+	@ApiModelProperty(value = "是否热门曲谱(0:否;1:是)",required = false)
 	private boolean hotFlag;
 	
-	@ApiModelProperty(value = "曲谱价格(整数)",required = false)
-	private Integer musicPrice;
+	@ApiModelProperty(value = "曲谱价格",required = false)
+	private java.math.BigDecimal musicPrice;
 	
 	@ApiModelProperty(value = "音频文件存储路径",required = false)
 	private String audioFileUrl;
@@ -62,20 +62,20 @@ public class MusicSheet {
 	@ApiModelProperty(value = "XML文件存储路径",required = false)
 	private String xmlFileUrl;
 	
-	@ApiModelProperty(value = "MP3是否自带节拍器(0:不带;1:带节拍器)",required = false)
-	private boolean mp3HasBeat;
+	@ApiModelProperty(value = "是否自带节拍器(0:否;1:是)",required = false)
+	private boolean hasBeat;
 	
 	@ApiModelProperty(value = "创建时间",required = false)
 	private java.util.Date createTime;
 	
 	@ApiModelProperty(value = "创建人(老师或者是后台平台用户)",required = false)
-	private Integer createUser;
+	private Long createBy;
 	
 	@ApiModelProperty(value = "更新时间",required = false)
 	private java.util.Date updateTime;
 	
 	@ApiModelProperty(value = "更新人(老师或者是后台平台用户)",required = false)
-	private Integer updateUser;
+	private Long updateBy;
 	
 	@ApiModelProperty(value = "备注",required = false)
 	private String remark;
@@ -88,20 +88,20 @@ public class MusicSheet {
 		return this.id;
 	}
 			
-	public void setMusicName(String musicName){
-		this.musicName = musicName;
+	public void setMusicSheetName(String musicSheetName){
+		this.musicSheetName = musicSheetName;
 	}
 	
-	public String getMusicName(){
-		return this.musicName;
+	public String getMusicSheetName(){
+		return this.musicSheetName;
 	}
 			
-	public void setMusicSource(Integer musicSource){
-		this.musicSource = musicSource;
+	public void setUserId(Long userId){
+		this.userId = userId;
 	}
 	
-	public Integer getMusicSource(){
-		return this.musicSource;
+	public Long getUserId(){
+		return this.userId;
 	}
 			
 	public void setComposer(String composer){
@@ -112,12 +112,12 @@ public class MusicSheet {
 		return this.composer;
 	}
 			
-	public void setMusicInstrument(String musicInstrument){
-		this.musicInstrument = musicInstrument;
+	public void setMusicSubject(String musicSubject){
+		this.musicSubject = musicSubject;
 	}
 	
-	public String getMusicInstrument(){
-		return this.musicInstrument;
+	public String getMusicSubject(){
+		return this.musicSubject;
 	}
 			
 	public void setAudioType(String audioType){
@@ -176,12 +176,12 @@ public class MusicSheet {
 		return this.auditStatus;
 	}
 			
-	public void setOrderNo(Integer orderNo){
-		this.orderNo = orderNo;
+	public void setSortNumber(Integer sortNumber){
+		this.sortNumber = sortNumber;
 	}
 	
-	public Integer getOrderNo(){
-		return this.orderNo;
+	public Integer getSortNumber(){
+		return this.sortNumber;
 	}
 			
 	public void setTopFlag(boolean topFlag){
@@ -200,11 +200,11 @@ public class MusicSheet {
 		return this.hotFlag;
 	}
 			
-	public void setMusicPrice(Integer musicPrice){
+	public void setMusicPrice(java.math.BigDecimal musicPrice){
 		this.musicPrice = musicPrice;
 	}
 	
-	public Integer getMusicPrice(){
+	public java.math.BigDecimal getMusicPrice(){
 		return this.musicPrice;
 	}
 			
@@ -224,12 +224,12 @@ public class MusicSheet {
 		return this.xmlFileUrl;
 	}
 			
-	public void setMp3HasBeat(boolean mp3HasBeat){
-		this.mp3HasBeat = mp3HasBeat;
+	public void setHasBeat(boolean hasBeat){
+		this.hasBeat = hasBeat;
 	}
 	
-	public boolean isMp3HasBeat(){
-		return this.mp3HasBeat;
+	public boolean isHasBeat(){
+		return this.hasBeat;
 	}
 			
 	public void setCreateTime(java.util.Date createTime){
@@ -240,12 +240,12 @@ public class MusicSheet {
 		return this.createTime;
 	}
 			
-	public void setCreateUser(Integer createUser){
-		this.createUser = createUser;
+	public void setCreateBy(Long createBy){
+		this.createBy = createBy;
 	}
 	
-	public Integer getCreateUser(){
-		return this.createUser;
+	public Long getCreateBy(){
+		return this.createBy;
 	}
 			
 	public void setUpdateTime(java.util.Date updateTime){
@@ -256,12 +256,12 @@ public class MusicSheet {
 		return this.updateTime;
 	}
 			
-	public void setUpdateUser(Integer updateUser){
-		this.updateUser = updateUser;
+	public void setUpdateBy(Long updateBy){
+		this.updateBy = updateBy;
 	}
 	
-	public Integer getUpdateUser(){
-		return this.updateUser;
+	public Long getUpdateBy(){
+		return this.updateBy;
 	}
 			
 	public void setRemark(String remark){

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

@@ -12,19 +12,22 @@ public class MusicSheetAccompaniment {
 	private Long id;
 	
 	@ApiModelProperty(value = "曲谱ID",required = false)
-	private Long musicId;
+	private Long musicSheetId;
 	
 	@ApiModelProperty(value = "声部",required = false)
-	private String instrument;
+	private String musicSubject;
 	
-	@ApiModelProperty(value = "MP3伴奏文件URL",required = false)
-	private String accompanimentUrl;
+	@ApiModelProperty(value = "MP3原声音频文件URL",required = false)
+	private String audioFileUrl;
+	
+	@ApiModelProperty(value = "排序号",required = false)
+	private Integer sortNumber;
 	
 	@ApiModelProperty(value = "创建时间",required = false)
 	private java.util.Date createTime;
 	
 	@ApiModelProperty(value = "创建人(老师或者是后台平台用户)",required = false)
-	private Long createUser;
+	private Long createBy;
 	
 	public void setId(Long id){
 		this.id = id;
@@ -34,28 +37,36 @@ public class MusicSheetAccompaniment {
 		return this.id;
 	}
 			
-	public void setMusicId(Long musicId){
-		this.musicId = musicId;
+	public void setMusicSheetId(Long musicSheetId){
+		this.musicSheetId = musicSheetId;
+	}
+	
+	public Long getMusicSheetId(){
+		return this.musicSheetId;
+	}
+			
+	public void setMusicSubject(String musicSubject){
+		this.musicSubject = musicSubject;
 	}
 	
-	public Long getMusicId(){
-		return this.musicId;
+	public String getMusicSubject(){
+		return this.musicSubject;
 	}
 			
-	public void setInstrument(String instrument){
-		this.instrument = instrument;
+	public void setAudioFileUrl(String audioFileUrl){
+		this.audioFileUrl = audioFileUrl;
 	}
 	
-	public String getInstrument(){
-		return this.instrument;
+	public String getAudioFileUrl(){
+		return this.audioFileUrl;
 	}
 			
-	public void setAccompanimentUrl(String accompanimentUrl){
-		this.accompanimentUrl = accompanimentUrl;
+	public void setSortNumber(Integer sortNumber){
+		this.sortNumber = sortNumber;
 	}
 	
-	public String getAccompanimentUrl(){
-		return this.accompanimentUrl;
+	public Integer getSortNumber(){
+		return this.sortNumber;
 	}
 			
 	public void setCreateTime(java.util.Date createTime){
@@ -66,12 +77,12 @@ public class MusicSheetAccompaniment {
 		return this.createTime;
 	}
 			
-	public void setCreateUser(Long createUser){
-		this.createUser = createUser;
+	public void setCreateBy(Long createBy){
+		this.createBy = createBy;
 	}
 	
-	public Long getCreateUser(){
-		return this.createUser;
+	public Long getCreateBy(){
+		return this.createBy;
 	}
 			
 	@Override

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

@@ -27,7 +27,7 @@ public class MusicSheetPurchaseRecord {
 	private java.util.Date purchaseTime;
 	
 	@ApiModelProperty(value = "购买价格",required = false)
-	private Integer purchasePrice;
+	private java.math.BigDecimal purchasePrice;
 	
 	@ApiModelProperty(value = "订单状态(1:已完成;0:取消)",required = false)
 	private boolean orderStatus;
@@ -80,11 +80,11 @@ public class MusicSheetPurchaseRecord {
 		return this.purchaseTime;
 	}
 			
-	public void setPurchasePrice(Integer purchasePrice){
+	public void setPurchasePrice(java.math.BigDecimal purchasePrice){
 		this.purchasePrice = purchasePrice;
 	}
 	
-	public Integer getPurchasePrice(){
+	public java.math.BigDecimal getPurchasePrice(){
 		return this.purchasePrice;
 	}
 			

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

@@ -11,8 +11,8 @@ public class VideoLessonEvaluate {
 	@ApiModelProperty(value = "主键",required = false)
 	private Long id;
 	
-	@ApiModelProperty(value = "视频课明细ID",required = false)
-	private Long videoItemId;
+	@ApiModelProperty(value = "视频ID",required = false)
+	private Long videoId;
 	
 	@ApiModelProperty(value = "学生ID",required = false)
 	private Long studentId;
@@ -31,12 +31,12 @@ public class VideoLessonEvaluate {
 		return this.id;
 	}
 			
-	public void setVideoItemId(Long videoItemId){
-		this.videoItemId = videoItemId;
+	public void setVideoId(Long videoId){
+		this.videoId = videoId;
 	}
 	
-	public Long getVideoItemId(){
-		return this.videoItemId;
+	public Long getVideoId(){
+		return this.videoId;
 	}
 			
 	public void setStudentId(Long studentId){

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/VideoLesson.java → cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/VideoLessonGroup.java

@@ -4,9 +4,9 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import io.swagger.annotations.ApiModelProperty;
 
 /**
- * 对应数据库表(video_lesson):
+ * 对应数据库表(video_lesson_group):
  */
-public class VideoLesson {
+public class VideoLessonGroup {
 
 	@ApiModelProperty(value = "主键",required = false)
 	private Long id;
@@ -15,7 +15,7 @@ public class VideoLesson {
 	private String lessonName;
 	
 	@ApiModelProperty(value = "课程声部",required = false)
-	private String lessonInstrument;
+	private String lessonSubject;
 	
 	@ApiModelProperty(value = "课程介绍",required = false)
 	private String lessonDesc;
@@ -33,7 +33,7 @@ public class VideoLesson {
 	private Integer lessonCount;
 	
 	@ApiModelProperty(value = "排序号",required = false)
-	private Integer orderNo;
+	private Integer sortNumber;
 	
 	@ApiModelProperty(value = "课程标签",required = false)
 	private String lessonTag;
@@ -69,12 +69,12 @@ public class VideoLesson {
 		return this.lessonName;
 	}
 			
-	public void setLessonInstrument(String lessonInstrument){
-		this.lessonInstrument = lessonInstrument;
+	public void setLessonSubject(String lessonSubject){
+		this.lessonSubject = lessonSubject;
 	}
 	
-	public String getLessonInstrument(){
-		return this.lessonInstrument;
+	public String getLessonSubject(){
+		return this.lessonSubject;
 	}
 			
 	public void setLessonDesc(String lessonDesc){
@@ -117,12 +117,12 @@ public class VideoLesson {
 		return this.lessonCount;
 	}
 			
-	public void setOrderNo(Integer orderNo){
-		this.orderNo = orderNo;
+	public void setSortNumber(Integer sortNumber){
+		this.sortNumber = sortNumber;
 	}
 	
-	public Integer getOrderNo(){
-		return this.orderNo;
+	public Integer getSortNumber(){
+		return this.sortNumber;
 	}
 			
 	public void setLessonTag(String lessonTag){

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/VideoLessonDetail.java → cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/VideoLessonGroupDetail.java

@@ -4,21 +4,21 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import io.swagger.annotations.ApiModelProperty;
 
 /**
- * 对应数据库表(video_lesson_detail):
+ * 对应数据库表(video_lesson_group_detail):
  */
-public class VideoLessonDetail {
+public class VideoLessonGroupDetail {
 
 	@ApiModelProperty(value = "主键",required = false)
 	private Long id;
 	
-	@ApiModelProperty(value = "课程ID",required = false)
-	private Long lessonId;
+	@ApiModelProperty(value = "课程组ID",required = false)
+	private Long videoLessonGroupId;
 	
 	@ApiModelProperty(value = "视频标题",required = false)
-	private String lessonTitle;
+	private String videoTitle;
 	
 	@ApiModelProperty(value = "视频内容",required = false)
-	private String lessonContent;
+	private String videoContent;
 	
 	@ApiModelProperty(value = "视频文件URL",required = false)
 	private String videoUrl;
@@ -26,8 +26,11 @@ public class VideoLessonDetail {
 	@ApiModelProperty(value = "视频封面图片URL",required = false)
 	private String coverUrl;
 	
+	@ApiModelProperty(value = "是否收费(1:收费;0:免费)",required = false)
+	private boolean chargeFlag;
+	
 	@ApiModelProperty(value = "排序号",required = false)
-	private Integer orderNum;
+	private Integer sortNumber;
 	
 	@ApiModelProperty(value = "创建人(老师ID)",required = false)
 	private Long teacherId;
@@ -35,6 +38,9 @@ public class VideoLessonDetail {
 	@ApiModelProperty(value = "创建时间",required = false)
 	private java.util.Date createTime;
 	
+	@ApiModelProperty(value = "更新人",required = false)
+	private Long updateBy;
+	
 	@ApiModelProperty(value = "更新时间",required = false)
 	private java.util.Date updateTime;
 	
@@ -46,28 +52,28 @@ public class VideoLessonDetail {
 		return this.id;
 	}
 			
-	public void setLessonId(Long lessonId){
-		this.lessonId = lessonId;
+	public void setVideoLessonGroupId(Long videoLessonGroupId){
+		this.videoLessonGroupId = videoLessonGroupId;
 	}
 	
-	public Long getLessonId(){
-		return this.lessonId;
+	public Long getVideoLessonGroupId(){
+		return this.videoLessonGroupId;
 	}
 			
-	public void setLessonTitle(String lessonTitle){
-		this.lessonTitle = lessonTitle;
+	public void setVideoTitle(String videoTitle){
+		this.videoTitle = videoTitle;
 	}
 	
-	public String getLessonTitle(){
-		return this.lessonTitle;
+	public String getVideoTitle(){
+		return this.videoTitle;
 	}
 			
-	public void setLessonContent(String lessonContent){
-		this.lessonContent = lessonContent;
+	public void setVideoContent(String videoContent){
+		this.videoContent = videoContent;
 	}
 	
-	public String getLessonContent(){
-		return this.lessonContent;
+	public String getVideoContent(){
+		return this.videoContent;
 	}
 			
 	public void setVideoUrl(String videoUrl){
@@ -86,12 +92,20 @@ public class VideoLessonDetail {
 		return this.coverUrl;
 	}
 			
-	public void setOrderNum(Integer orderNum){
-		this.orderNum = orderNum;
+	public void setChargeFlag(boolean chargeFlag){
+		this.chargeFlag = chargeFlag;
+	}
+	
+	public boolean isChargeFlag(){
+		return this.chargeFlag;
+	}
+			
+	public void setSortNumber(Integer sortNumber){
+		this.sortNumber = sortNumber;
 	}
 	
-	public Integer getOrderNum(){
-		return this.orderNum;
+	public Integer getSortNumber(){
+		return this.sortNumber;
 	}
 			
 	public void setTeacherId(Long teacherId){
@@ -110,6 +124,14 @@ public class VideoLessonDetail {
 		return this.createTime;
 	}
 			
+	public void setUpdateBy(Long updateBy){
+		this.updateBy = updateBy;
+	}
+	
+	public Long getUpdateBy(){
+		return this.updateBy;
+	}
+			
 	public void setUpdateTime(java.util.Date updateTime){
 		this.updateTime = updateTime;
 	}

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

@@ -11,8 +11,8 @@ public class VideoLessonPurchaseRecord {
 	@ApiModelProperty(value = "主键",required = false)
 	private Long id;
 	
-	@ApiModelProperty(value = "视频课ID",required = false)
-	private Long lessonId;
+	@ApiModelProperty(value = "视频课组ID",required = false)
+	private Long videoLessonGroupId;
 	
 	@ApiModelProperty(value = "学生ID",required = false)
 	private Long studentId;
@@ -21,12 +21,12 @@ public class VideoLessonPurchaseRecord {
 	private java.util.Date purchaseTime;
 	
 	@ApiModelProperty(value = "支付金额",required = false)
-	private Integer payMoney;
+	private java.math.BigDecimal payMoney;
 	
 	@ApiModelProperty(value = "订单流水号",required = false)
 	private String orderNo;
 	
-	@ApiModelProperty(value = "订单状态",required = false)
+	@ApiModelProperty(value = "订单状态(1:已完成;0:取消)",required = false)
 	private boolean orderStatus;
 	
 	public void setId(Long id){
@@ -37,12 +37,12 @@ public class VideoLessonPurchaseRecord {
 		return this.id;
 	}
 			
-	public void setLessonId(Long lessonId){
-		this.lessonId = lessonId;
+	public void setVideoLessonGroupId(Long videoLessonGroupId){
+		this.videoLessonGroupId = videoLessonGroupId;
 	}
 	
-	public Long getLessonId(){
-		return this.lessonId;
+	public Long getVideoLessonGroupId(){
+		return this.videoLessonGroupId;
 	}
 			
 	public void setStudentId(Long studentId){
@@ -61,11 +61,11 @@ public class VideoLessonPurchaseRecord {
 		return this.purchaseTime;
 	}
 			
-	public void setPayMoney(Integer payMoney){
+	public void setPayMoney(java.math.BigDecimal payMoney){
 		this.payMoney = payMoney;
 	}
 	
-	public Integer getPayMoney(){
+	public java.math.BigDecimal getPayMoney(){
 		return this.payMoney;
 	}
 			

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

@@ -11,8 +11,8 @@ public class VideoLessonStudyRecord {
 	@ApiModelProperty(value = "主键",required = false)
 	private Long id;
 	
-	@ApiModelProperty(value = "视频课ID",required = false)
-	private Long lessonId;
+	@ApiModelProperty(value = "视频课组ID",required = false)
+	private Long videoLessonGroupId;
 	
 	@ApiModelProperty(value = "视频ID",required = false)
 	private Long videoId;
@@ -20,8 +20,8 @@ public class VideoLessonStudyRecord {
 	@ApiModelProperty(value = "学生ID",required = false)
 	private Long studentId;
 	
-	@ApiModelProperty(value = "是否学完",required = false)
-	private boolean lessonFinished;
+	@ApiModelProperty(value = "是否学完(1:是;0:否)",required = false)
+	private boolean finishFlag;
 	
 	@ApiModelProperty(value = "学习开始时间",required = false)
 	private java.util.Date startTime;
@@ -37,12 +37,12 @@ public class VideoLessonStudyRecord {
 		return this.id;
 	}
 			
-	public void setLessonId(Long lessonId){
-		this.lessonId = lessonId;
+	public void setVideoLessonGroupId(Long videoLessonGroupId){
+		this.videoLessonGroupId = videoLessonGroupId;
 	}
 	
-	public Long getLessonId(){
-		return this.lessonId;
+	public Long getVideoLessonGroupId(){
+		return this.videoLessonGroupId;
 	}
 			
 	public void setVideoId(Long videoId){
@@ -61,12 +61,12 @@ public class VideoLessonStudyRecord {
 		return this.studentId;
 	}
 			
-	public void setLessonFinished(boolean lessonFinished){
-		this.lessonFinished = lessonFinished;
+	public void setFinishFlag(boolean finishFlag){
+		this.finishFlag = finishFlag;
 	}
 	
-	public boolean isLessonFinished(){
-		return this.lessonFinished;
+	public boolean isFinishFlag(){
+		return this.finishFlag;
 	}
 			
 	public void setStartTime(java.util.Date startTime){

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/AlbumFavoriteService.java

@@ -0,0 +1,8 @@
+package com.yonge.cooleshow.biz.dal.service;
+
+import com.yonge.cooleshow.biz.dal.entity.AlbumFavorite;
+import com.yonge.cooleshow.common.service.BaseService;
+
+public interface AlbumFavoriteService extends BaseService<Long, AlbumFavorite> {
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/MusicFavoriteService.java

@@ -0,0 +1,8 @@
+package com.yonge.cooleshow.biz.dal.service;
+
+import com.yonge.cooleshow.biz.dal.entity.MusicFavorite;
+import com.yonge.cooleshow.common.service.BaseService;
+
+public interface MusicFavoriteService extends BaseService<Long, MusicFavorite> {
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/StudentFavoriteAlbumService.java

@@ -1,8 +0,0 @@
-package com.yonge.cooleshow.biz.dal.service;
-
-import com.yonge.cooleshow.biz.dal.entity.StudentFavoriteAlbum;
-import com.yonge.cooleshow.common.service.BaseService;
-
-public interface StudentFavoriteAlbumService extends BaseService<Long, StudentFavoriteAlbum> {
-
-}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/StudentFavoriteMusicService.java

@@ -1,8 +0,0 @@
-package com.yonge.cooleshow.biz.dal.service;
-
-import com.yonge.cooleshow.biz.dal.entity.StudentFavoriteMusic;
-import com.yonge.cooleshow.common.service.BaseService;
-
-public interface StudentFavoriteMusicService extends BaseService<Long, StudentFavoriteMusic> {
-
-}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/VideoLessonDetailService.java

@@ -1,8 +0,0 @@
-package com.yonge.cooleshow.biz.dal.service;
-
-import com.yonge.cooleshow.biz.dal.entity.VideoLessonDetail;
-import com.yonge.cooleshow.common.service.BaseService;
-
-public interface VideoLessonDetailService extends BaseService<Long, VideoLessonDetail> {
-
-}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/VideoLessonGroupDetailService.java

@@ -0,0 +1,8 @@
+package com.yonge.cooleshow.biz.dal.service;
+
+import com.yonge.cooleshow.biz.dal.entity.VideoLessonGroupDetail;
+import com.yonge.cooleshow.common.service.BaseService;
+
+public interface VideoLessonGroupDetailService extends BaseService<Long, VideoLessonGroupDetail> {
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/VideoLessonGroupService.java

@@ -0,0 +1,8 @@
+package com.yonge.cooleshow.biz.dal.service;
+
+import com.yonge.cooleshow.biz.dal.entity.VideoLessonGroup;
+import com.yonge.cooleshow.common.service.BaseService;
+
+public interface VideoLessonGroupService extends BaseService<Long, VideoLessonGroup> {
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/VideoLessonService.java

@@ -1,8 +0,0 @@
-package com.yonge.cooleshow.biz.dal.service;
-
-import com.yonge.cooleshow.biz.dal.entity.VideoLesson;
-import com.yonge.cooleshow.common.service.BaseService;
-
-public interface VideoLessonService extends BaseService<Long, VideoLesson> {
-
-}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/AlbumFavoriteServiceImpl.java

@@ -0,0 +1,23 @@
+package com.yonge.cooleshow.biz.dal.service.impl;
+
+import com.yonge.cooleshow.common.dal.BaseDAO;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+import com.yonge.cooleshow.biz.dal.entity.AlbumFavorite;
+import com.yonge.cooleshow.biz.dal.service.AlbumFavoriteService;
+import com.yonge.cooleshow.biz.dal.dao.AlbumFavoriteDao;
+
+@Service
+public class AlbumFavoriteServiceImpl extends BaseServiceImpl<Long, AlbumFavorite>  implements AlbumFavoriteService {
+	
+	@Autowired
+	private AlbumFavoriteDao albumFavoriteDao;
+
+	@Override
+	public BaseDAO<Long, AlbumFavorite> getDAO() {
+		return albumFavoriteDao;
+	}
+	
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/MusicFavoriteServiceImpl.java

@@ -0,0 +1,23 @@
+package com.yonge.cooleshow.biz.dal.service.impl;
+
+import com.yonge.cooleshow.common.dal.BaseDAO;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+import com.yonge.cooleshow.biz.dal.entity.MusicFavorite;
+import com.yonge.cooleshow.biz.dal.service.MusicFavoriteService;
+import com.yonge.cooleshow.biz.dal.dao.MusicFavoriteDao;
+
+@Service
+public class MusicFavoriteServiceImpl extends BaseServiceImpl<Long, MusicFavorite>  implements MusicFavoriteService {
+	
+	@Autowired
+	private MusicFavoriteDao musicFavoriteDao;
+
+	@Override
+	public BaseDAO<Long, MusicFavorite> getDAO() {
+		return musicFavoriteDao;
+	}
+	
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/StudentFavoriteAlbumServiceImpl.java

@@ -1,23 +0,0 @@
-package com.yonge.cooleshow.biz.dal.service.impl;
-
-import com.yonge.cooleshow.common.dal.BaseDAO;
-import org.springframework.beans.factory.annotation.Autowired;
-import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
-import org.springframework.stereotype.Service;
-
-import com.yonge.cooleshow.biz.dal.entity.StudentFavoriteAlbum;
-import com.yonge.cooleshow.biz.dal.service.StudentFavoriteAlbumService;
-import com.yonge.cooleshow.biz.dal.dao.StudentFavoriteAlbumDao;
-
-@Service
-public class StudentFavoriteAlbumServiceImpl extends BaseServiceImpl<Long, StudentFavoriteAlbum>  implements StudentFavoriteAlbumService {
-	
-	@Autowired
-	private StudentFavoriteAlbumDao studentFavoriteAlbumDao;
-
-	@Override
-	public BaseDAO<Long, StudentFavoriteAlbum> getDAO() {
-		return studentFavoriteAlbumDao;
-	}
-	
-}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/StudentFavoriteMusicServiceImpl.java

@@ -1,23 +0,0 @@
-package com.yonge.cooleshow.biz.dal.service.impl;
-
-import com.yonge.cooleshow.common.dal.BaseDAO;
-import org.springframework.beans.factory.annotation.Autowired;
-import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
-import org.springframework.stereotype.Service;
-
-import com.yonge.cooleshow.biz.dal.entity.StudentFavoriteMusic;
-import com.yonge.cooleshow.biz.dal.service.StudentFavoriteMusicService;
-import com.yonge.cooleshow.biz.dal.dao.StudentFavoriteMusicDao;
-
-@Service
-public class StudentFavoriteMusicServiceImpl extends BaseServiceImpl<Long, StudentFavoriteMusic>  implements StudentFavoriteMusicService {
-	
-	@Autowired
-	private StudentFavoriteMusicDao studentFavoriteMusicDao;
-
-	@Override
-	public BaseDAO<Long, StudentFavoriteMusic> getDAO() {
-		return studentFavoriteMusicDao;
-	}
-	
-}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/VideoLessonDetailServiceImpl.java

@@ -1,23 +0,0 @@
-package com.yonge.cooleshow.biz.dal.service.impl;
-
-import com.yonge.cooleshow.common.dal.BaseDAO;
-import org.springframework.beans.factory.annotation.Autowired;
-import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
-import org.springframework.stereotype.Service;
-
-import com.yonge.cooleshow.biz.dal.entity.VideoLessonDetail;
-import com.yonge.cooleshow.biz.dal.service.VideoLessonDetailService;
-import com.yonge.cooleshow.biz.dal.dao.VideoLessonDetailDao;
-
-@Service
-public class VideoLessonDetailServiceImpl extends BaseServiceImpl<Long, VideoLessonDetail>  implements VideoLessonDetailService {
-	
-	@Autowired
-	private VideoLessonDetailDao videoLessonDetailDao;
-
-	@Override
-	public BaseDAO<Long, VideoLessonDetail> getDAO() {
-		return videoLessonDetailDao;
-	}
-	
-}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/VideoLessonGroupDetailServiceImpl.java

@@ -0,0 +1,23 @@
+package com.yonge.cooleshow.biz.dal.service.impl;
+
+import com.yonge.cooleshow.common.dal.BaseDAO;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+import com.yonge.cooleshow.biz.dal.entity.VideoLessonGroupDetail;
+import com.yonge.cooleshow.biz.dal.service.VideoLessonGroupDetailService;
+import com.yonge.cooleshow.biz.dal.dao.VideoLessonGroupDetailDao;
+
+@Service
+public class VideoLessonGroupDetailServiceImpl extends BaseServiceImpl<Long, VideoLessonGroupDetail>  implements VideoLessonGroupDetailService {
+	
+	@Autowired
+	private VideoLessonGroupDetailDao videoLessonGroupDetailDao;
+
+	@Override
+	public BaseDAO<Long, VideoLessonGroupDetail> getDAO() {
+		return videoLessonGroupDetailDao;
+	}
+	
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/VideoLessonGroupServiceImpl.java

@@ -0,0 +1,23 @@
+package com.yonge.cooleshow.biz.dal.service.impl;
+
+import com.yonge.cooleshow.common.dal.BaseDAO;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+import com.yonge.cooleshow.biz.dal.entity.VideoLessonGroup;
+import com.yonge.cooleshow.biz.dal.service.VideoLessonGroupService;
+import com.yonge.cooleshow.biz.dal.dao.VideoLessonGroupDao;
+
+@Service
+public class VideoLessonGroupServiceImpl extends BaseServiceImpl<Long, VideoLessonGroup>  implements VideoLessonGroupService {
+	
+	@Autowired
+	private VideoLessonGroupDao videoLessonGroupDao;
+
+	@Override
+	public BaseDAO<Long, VideoLessonGroup> getDAO() {
+		return videoLessonGroupDao;
+	}
+	
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/VideoLessonServiceImpl.java

@@ -1,23 +0,0 @@
-package com.yonge.cooleshow.biz.dal.service.impl;
-
-import com.yonge.cooleshow.common.dal.BaseDAO;
-import org.springframework.beans.factory.annotation.Autowired;
-import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
-import org.springframework.stereotype.Service;
-
-import com.yonge.cooleshow.biz.dal.entity.VideoLesson;
-import com.yonge.cooleshow.biz.dal.service.VideoLessonService;
-import com.yonge.cooleshow.biz.dal.dao.VideoLessonDao;
-
-@Service
-public class VideoLessonServiceImpl extends BaseServiceImpl<Long, VideoLesson>  implements VideoLessonService {
-	
-	@Autowired
-	private VideoLessonDao videoLessonDao;
-
-	@Override
-	public BaseDAO<Long, VideoLesson> getDAO() {
-		return videoLessonDao;
-	}
-	
-}

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

@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!--
+这个文件是自动生成的。
+不要修改此文件。所有改动将在下次重新自动生成时丢失。
+-->
+<mapper namespace="com.yonge.cooleshow.biz.dal.dao.AlbumFavoriteDao">
+	
+	<resultMap type="com.yonge.cooleshow.biz.dal.entity.AlbumFavorite" id="BaseResultMap">
+		<result column="id_" property="id" />
+		<result column="user_id_" property="userId" />
+		<result column="album_id_" property="albumId" />
+		<result column="favorite_time_" property="favoriteTime" />
+		<result column="favorite_flag_" property="favoriteFlag" />
+	</resultMap>
+	
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="BaseResultMap" >
+		SELECT * FROM album_favorite WHERE id_ = #{id} 
+	</select>
+	
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="BaseResultMap">
+		SELECT * FROM album_favorite ORDER BY id_
+	</select>
+	
+	<!-- 向数据库增加一条记录 -->
+    <delete id="delete" parameterType="AlbumFavorite">
+        delete from album_favorite
+        where 1=1
+        <if test="userId != null and userId != ''">
+            and user_id_ = #{userId}
+        </if>
+        <if test="albumId != null and albumId != ''">
+            and album_id_ = #{albumId}
+        </if>
+        <if test="favoriteTime != null and favoriteTime != ''">
+            and favorite_time_ = #{favoriteTime}
+        </if>
+        <if test="favoriteFlag != null and favoriteFlag != ''">
+            and favorite_flag_ = #{favoriteFlag}
+        </if>
+    </delete>
+
+    <insert id="insert" parameterType="AlbumFavorite">
+        insert into album_favorite
+        (user_id_,album_id_,favorite_time_,favorite_flag_)
+        values
+        (#{userId},#{albumId},#{favoriteTime},#{favoriteFlag})
+    </insert>
+
+    <update id="update" parameterType="AlbumFavorite">
+        update album_favorite
+        <set>
+            <if test="userId != null">
+                user_id_ = #{userId},
+            </if>
+            <if test="albumId != null">
+                album_id_ = #{albumId},
+            </if>
+            <if test="favoriteTime != null">
+                favorite_time_ = #{favoriteTime},
+            </if>
+            <if test="favoriteFlag != null">
+                favorite_flag_ = #{favoriteFlag},
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+
+    <select id="findList" parameterType="AlbumFavorite" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List" />
+        from album_favorite
+        where 1=1
+        <if test="userId != null">
+            and user_id_ = #{userId}
+        </if>
+        <if test="albumId != null">
+            and album_id_ = #{albumId}
+        </if>
+        <if test="favoriteTime != null">
+            and favorite_time_ = #{favoriteTime}
+        </if>
+        <if test="favoriteFlag != null">
+            and favorite_flag_ = #{favoriteFlag}
+        </if>
+    </select>
+	
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete" >
+		DELETE FROM album_favorite WHERE id_ = #{id} 
+	</delete>
+	
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="BaseResultMap" parameterType="map">
+		SELECT * FROM album_favorite ORDER BY id_ <include refid="global.limit"/>
+	</select>
+	
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM album_favorite
+	</select>
+</mapper>

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

@@ -5,15 +5,15 @@
 不要修改此文件。所有改动将在下次重新自动生成时丢失。
 -->
 <mapper namespace="com.yonge.cooleshow.biz.dal.dao.AlbumMusicRelateDao">
-
-    <resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.AlbumMusicRelate">
-        <id column="id" jdbcType="BIGINT" property="id" />
-        <result column="album_id_" jdbcType="BIGINT" property="albumId" />
-        <result column="music_sheet_id_" jdbcType="BIGINT" property="musicSheetId" />
-        <result column="order_num_" jdbcType="TINYINT" property="orderNum" />
-        <result column="create_time_" jdbcType="TIMESTAMP" property="createTime" />
-        <result column="create_user_" jdbcType="BIGINT" property="createUser" />
-    </resultMap>
+	
+	<resultMap type="com.yonge.cooleshow.biz.dal.entity.AlbumMusicRelate" id="BaseResultMap">
+		<result column="id_" property="id" />
+		<result column="album_id_" property="albumId" />
+		<result column="music_sheet_id_" property="musicSheetId" />
+		<result column="sort_number_" property="sortNumber" />
+		<result column="create_time_" property="createTime" />
+		<result column="create_by_" property="createBy" />
+	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
 	<select id="get" resultMap="BaseResultMap" >
@@ -26,16 +26,35 @@
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.yonge.cooleshow.biz.dal.entity.AlbumMusicRelate" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+    <delete id="delete" parameterType="AlbumMusicRelate">
+        delete from album_music_relate
+        where 1=1
+        <if test="albumId != null and albumId != ''">
+            and album_id_ = #{albumId}
+        </if>
+        <if test="musicSheetId != null and musicSheetId != ''">
+            and music_sheet_id_ = #{musicSheetId}
+        </if>
+        <if test="sortNumber != null and sortNumber != ''">
+            and sort_number_ = #{sortNumber}
+        </if>
+        <if test="createTime != null and createTime != ''">
+            and create_time_ = #{createTime}
+        </if>
+        <if test="createBy != null and createBy != ''">
+            and create_by_ = #{createBy}
+        </if>
+    </delete>
+
+    <insert id="insert" parameterType="AlbumMusicRelate">
         insert into album_music_relate
-        (album_id_,music_sheet_id_,order_num_,create_time_,create_user_)
+        (album_id_,music_sheet_id_,sort_number_,create_time_,create_by_)
         values
-        (#{albumId},#{musicSheetId},#{orderNum},sysdate(),#{createUser})
+        (#{albumId},#{musicSheetId},#{sortNumber},sysdate(),#{createBy})
     </insert>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.yonge.cooleshow.biz.dal.entity.AlbumMusicRelate">
-		UPDATE album_music_relate
+
+    <update id="update" parameterType="AlbumMusicRelate">
+        update album_music_relate
         <set>
             <if test="albumId != null">
                 album_id_ = #{albumId},
@@ -43,43 +62,45 @@
             <if test="musicSheetId != null">
                 music_sheet_id_ = #{musicSheetId},
             </if>
-            <if test="orderNum != null">
-                order_num_ = #{orderNum},
+            <if test="sortNumber != null">
+                sort_number_ = #{sortNumber},
             </if>
             <if test="createTime != null">
                 create_time_ = #{createTime},
             </if>
-            <if test="createUser != null">
-                create_user_ = #{createUser},
+            <if test="createBy != null">
+                create_by_ = #{createBy},
             </if>
         </set>
-        where id_ = #{id}
-	</update>
-	
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
-		DELETE FROM album_music_relate WHERE id_ = #{id} 
-	</delete>
+        where id = #{id}
+    </update>
 
-    <delete id="delete" parameterType="com.yonge.cooleshow.biz.dal.entity.AlbumMusicRelate">
-        delete from album_music_relate
+    <select id="findList" parameterType="AlbumMusicRelate" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List" />
+        from album_music_relate
         where 1=1
-        <if test="albumId != null and albumId != ''">
+        <if test="albumId != null">
             and album_id_ = #{albumId}
         </if>
-        <if test="musicSheetId != null and musicSheetId != ''">
+        <if test="musicSheetId != null">
             and music_sheet_id_ = #{musicSheetId}
         </if>
-        <if test="orderNum != null and orderNum != ''">
-            and order_num_ = #{orderNum}
+        <if test="sortNumber != null">
+            and sort_number_ = #{sortNumber}
         </if>
-        <if test="createTime != null and createTime != ''">
+        <if test="createTime != null">
             and create_time_ = #{createTime}
         </if>
-        <if test="createUser != null and createUser != ''">
-            and create_user_ = #{createUser}
+        <if test="createBy != null">
+            and create_by_ = #{createBy}
         </if>
-    </delete>
+    </select>
+	
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete" >
+		DELETE FROM album_music_relate WHERE id_ = #{id} 
+	</delete>
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="BaseResultMap" parameterType="map">
@@ -90,25 +111,4 @@
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM album_music_relate
 	</select>
-
-    <select id="findList" parameterType="com.yonge.cooleshow.biz.dal.entity.AlbumMusicRelate" resultMap="BaseResultMap">
-        select *
-        from album_music_relate
-        where 1=1
-        <if test="albumId != null">
-            and album_id_ = #{albumId}
-        </if>
-        <if test="musicSheetId != null">
-            and music_sheet_id_ = #{musicSheetId}
-        </if>
-        <if test="orderNum != null">
-            and order_num_ = #{orderNum}
-        </if>
-        <if test="createTime != null">
-            and create_time_ = #{createTime}
-        </if>
-        <if test="createUser != null">
-            and create_user_ = #{createUser}
-        </if>
-    </select>
 </mapper>

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

@@ -5,22 +5,22 @@
 不要修改此文件。所有改动将在下次重新自动生成时丢失。
 -->
 <mapper namespace="com.yonge.cooleshow.biz.dal.dao.MusicAlbumDao">
-
-    <resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.MusicAlbum">
-        <id column="id" jdbcType="BIGINT" property="id" />
-        <result column="album_name_" jdbcType="VARCHAR" property="albumName" />
-        <result column="album_desc_" jdbcType="VARCHAR" property="albumDesc" />
-        <result column="album_tag_" jdbcType="VARCHAR" property="albumTag" />
-        <result column="album_cover_url_" jdbcType="VARCHAR" property="albumCoverUrl" />
-        <result column="album_status_" jdbcType="TINYINT" property="albumStatus" />
-        <result column="order_no_" jdbcType="INTEGER" property="orderNo" />
-        <result column="hot_flag_" jdbcType="TINYINT" property="hotFlag" />
-        <result column="top_flag_" jdbcType="TINYINT" property="topFlag" />
-        <result column="create_time_" jdbcType="TIMESTAMP" property="createTime" />
-        <result column="create_user_" jdbcType="INTEGER" property="createUser" />
-        <result column="update_time_" jdbcType="TIMESTAMP" property="updateTime" />
-        <result column="update_user_" jdbcType="INTEGER" property="updateUser" />
-    </resultMap>
+	
+	<resultMap type="com.yonge.cooleshow.biz.dal.entity.MusicAlbum" id="BaseResultMap">
+		<result column="id_" property="id" />
+		<result column="album_name_" property="albumName" />
+		<result column="album_desc_" property="albumDesc" />
+		<result column="album_tag_" property="albumTag" />
+		<result column="album_cover_url_" property="albumCoverUrl" />
+		<result column="album_status_" property="albumStatus" />
+		<result column="sort_number_" property="sortNumber" />
+		<result column="hot_flag_" property="hotFlag" />
+		<result column="top_flag_" property="topFlag" />
+		<result column="create_time_" property="createTime" />
+		<result column="create_by_" property="createBy" />
+		<result column="update_time_" property="updateTime" />
+		<result column="update_by_" property="updateBy" />
+	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
 	<select id="get" resultMap="BaseResultMap" >
@@ -31,63 +31,6 @@
 	<select id="findAll" resultMap="BaseResultMap">
 		SELECT * FROM music_album ORDER BY id_
 	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.yonge.cooleshow.biz.dal.entity.MusicAlbum" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-        insert into music_album
-        (album_name_,album_desc_,album_tag_,album_cover_url_,album_status_,order_no_,hot_flag_,top_flag_,create_time_,create_user_,update_time_,update_user_)
-        values
-        (#{albumName},#{albumDesc},#{albumTag},#{albumCoverUrl},#{albumStatus},#{orderNo},#{hotFlag},#{topFlag},sysdate(),#{createUser},#{updateTime},#{updateUser})
-    </insert>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.yonge.cooleshow.biz.dal.entity.MusicAlbum">
-		UPDATE music_album
-        <set>
-        <if test="albumName != null and albumName != ''">
-            album_name_ = #{albumName},
-        </if>
-        <if test="albumDesc != null and albumDesc != ''">
-            album_desc_ = #{albumDesc},
-        </if>
-        <if test="albumTag != null and albumTag != ''">
-            album_tag_ = #{albumTag},
-        </if>
-        <if test="albumCoverUrl != null and albumCoverUrl != ''">
-            album_cover_url_ = #{albumCoverUrl},
-        </if>
-        <if test="albumStatus != null">
-            album_status_ = #{albumStatus},
-        </if>
-        <if test="orderNo != null">
-            order_no_ = #{orderNo},
-        </if>
-        <if test="hotFlag != null">
-            hot_flag_ = #{hotFlag},
-        </if>
-        <if test="topFlag != null">
-            top_flag_ = #{topFlag},
-        </if>
-        <if test="createTime != null">
-            create_time_ = #{createTime},
-        </if>
-        <if test="createUser != null">
-            create_user_ = #{createUser},
-        </if>
-        <if test="updateTime != null">
-            update_time_ = #{updateTime},
-        </if>
-        <if test="updateUser != null">
-            update_user_ = #{updateUser},
-        </if>
-        </set>
-        WHERE id_ = #{id}
-	</update>
-	
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
-		DELETE FROM music_album WHERE id_ = #{id} 
-	</delete>
 
     <delete id="delete" parameterType="MusicAlbum">
         delete from music_album
@@ -107,8 +50,8 @@
         <if test="albumStatus != null and albumStatus != ''">
             and album_status_ = #{albumStatus}
         </if>
-        <if test="orderNo != null and orderNo != ''">
-            and order_no_ = #{orderNo}
+        <if test="sortNumber != null and sortNumber != ''">
+            and sort_number_ = #{sortNumber}
         </if>
         <if test="hotFlag != null and hotFlag != ''">
             and hot_flag_ = #{hotFlag}
@@ -119,29 +62,70 @@
         <if test="createTime != null and createTime != ''">
             and create_time_ = #{createTime}
         </if>
-        <if test="createUser != null and createUser != ''">
-            and create_user_ = #{createUser}
+        <if test="createBy != null and createBy != ''">
+            and create_by_ = #{createBy}
         </if>
         <if test="updateTime != null and updateTime != ''">
             and update_time_ = #{updateTime}
         </if>
-        <if test="updateUser != null and updateUser != ''">
-            and update_user_ = #{updateUser}
+        <if test="updateBy != null and updateBy != ''">
+            and update_by_ = #{updateBy}
         </if>
     </delete>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="BaseResultMap" parameterType="map">
-		SELECT * FROM music_album ORDER BY id_ <include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM music_album
-	</select>
+
+    <insert id="insert" parameterType="MusicAlbum">
+        insert into music_album
+        (album_name_,album_desc_,album_tag_,album_cover_url_,album_status_,sort_number_,hot_flag_,top_flag_,create_time_,create_by_,update_time_,update_by_)
+        values
+        (#{albumName},#{albumDesc},#{albumTag},#{albumCoverUrl},#{albumStatus},#{sortNumber},#{hotFlag},#{topFlag},sysdate(),#{createBy},#{updateTime},#{updateBy})
+    </insert>
+
+    <update id="update" parameterType="MusicAlbum">
+        update music_album
+        <set>
+            <if test="albumName != null and albumName != ''">
+                album_name_ = #{albumName},
+            </if>
+            <if test="albumDesc != null and albumDesc != ''">
+                album_desc_ = #{albumDesc},
+            </if>
+            <if test="albumTag != null and albumTag != ''">
+                album_tag_ = #{albumTag},
+            </if>
+            <if test="albumCoverUrl != null and albumCoverUrl != ''">
+                album_cover_url_ = #{albumCoverUrl},
+            </if>
+            <if test="albumStatus != null">
+                album_status_ = #{albumStatus},
+            </if>
+            <if test="sortNumber != null">
+                sort_number_ = #{sortNumber},
+            </if>
+            <if test="hotFlag != null">
+                hot_flag_ = #{hotFlag},
+            </if>
+            <if test="topFlag != null">
+                top_flag_ = #{topFlag},
+            </if>
+            <if test="createTime != null">
+                create_time_ = #{createTime},
+            </if>
+            <if test="createBy != null">
+                create_by_ = #{createBy},
+            </if>
+            <if test="updateTime != null">
+                update_time_ = #{updateTime},
+            </if>
+            <if test="updateBy != null">
+                update_by_ = #{updateBy},
+            </if>
+        </set>
+        where id = #{id}
+    </update>
 
     <select id="findList" parameterType="MusicAlbum" resultMap="BaseResultMap">
-        select *
+        select
+        <include refid="Base_Column_List" />
         from music_album
         where 1=1
         <if test="albumName != null and albumName != ''">
@@ -159,8 +143,8 @@
         <if test="albumStatus != null">
             and album_status_ = #{albumStatus}
         </if>
-        <if test="orderNo != null">
-            and order_no_ = #{orderNo}
+        <if test="sortNumber != null">
+            and sort_number_ = #{sortNumber}
         </if>
         <if test="hotFlag != null">
             and hot_flag_ = #{hotFlag}
@@ -171,14 +155,29 @@
         <if test="createTime != null">
             and create_time_ = #{createTime}
         </if>
-        <if test="createUser != null">
-            and create_user_ = #{createUser}
+        <if test="createBy != null">
+            and create_by_ = #{createBy}
         </if>
         <if test="updateTime != null">
             and update_time_ = #{updateTime}
         </if>
-        <if test="updateUser != null">
-            and update_user_ = #{updateUser}
+        <if test="updateBy != null">
+            and update_by_ = #{updateBy}
         </if>
     </select>
+	
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete" >
+		DELETE FROM music_album WHERE id_ = #{id} 
+	</delete>
+	
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="BaseResultMap" parameterType="map">
+		SELECT * FROM music_album ORDER BY id_ <include refid="global.limit"/>
+	</select>
+	
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM music_album
+	</select>
 </mapper>

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

@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!--
+这个文件是自动生成的。
+不要修改此文件。所有改动将在下次重新自动生成时丢失。
+-->
+<mapper namespace="com.yonge.cooleshow.biz.dal.dao.MusicFavoriteDao">
+	
+	<resultMap type="com.yonge.cooleshow.biz.dal.entity.MusicFavorite" id="BaseResultMap">
+		<result column="id_" property="id" />
+		<result column="user_id_" property="userId" />
+		<result column="music_sheet_id_" property="musicSheetId" />
+		<result column="favorite_time_" property="favoriteTime" />
+		<result column="favorite_flag_" property="favoriteFlag" />
+	</resultMap>
+	
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="BaseResultMap" >
+		SELECT * FROM music_favorite WHERE id_ = #{id} 
+	</select>
+	
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="BaseResultMap">
+		SELECT * FROM music_favorite ORDER BY id_
+	</select>
+
+    <delete id="delete" parameterType="MusicFavorite">
+        delete from music_favorite
+        where 1=1
+        <if test="userId != null and userId != ''">
+            and user_id_ = #{userId}
+        </if>
+        <if test="musicSheetId != null and musicSheetId != ''">
+            and music_sheet_id_ = #{musicSheetId}
+        </if>
+        <if test="favoriteTime != null and favoriteTime != ''">
+            and favorite_time_ = #{favoriteTime}
+        </if>
+        <if test="favoriteFlag != null and favoriteFlag != ''">
+            and favorite_flag_ = #{favoriteFlag}
+        </if>
+    </delete>
+
+    <insert id="insert" parameterType="MusicFavorite">
+        insert into music_favorite
+        (user_id_,music_sheet_id_,favorite_time_,favorite_flag_)
+        values
+        (#{userId},#{musicSheetId},#{favoriteTime},#{favoriteFlag})
+    </insert>
+
+    <update id="update" parameterType="MusicFavorite">
+        update music_favorite
+        <set>
+            <if test="userId != null">
+                user_id_ = #{userId},
+            </if>
+            <if test="musicSheetId != null">
+                music_sheet_id_ = #{musicSheetId},
+            </if>
+            <if test="favoriteTime != null">
+                favorite_time_ = #{favoriteTime},
+            </if>
+            <if test="favoriteFlag != null">
+                favorite_flag_ = #{favoriteFlag},
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+
+    <select id="findList" parameterType="MusicFavorite" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List" />
+        from music_favorite
+        where 1=1
+        <if test="userId != null">
+            and user_id_ = #{userId}
+        </if>
+        <if test="musicSheetId != null">
+            and music_sheet_id_ = #{musicSheetId}
+        </if>
+        <if test="favoriteTime != null">
+            and favorite_time_ = #{favoriteTime}
+        </if>
+        <if test="favoriteFlag != null">
+            and favorite_flag_ = #{favoriteFlag}
+        </if>
+    </select>
+	
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete" >
+		DELETE FROM music_favorite WHERE id_ = #{id} 
+	</delete>
+	
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="BaseResultMap" parameterType="map">
+		SELECT * FROM music_favorite ORDER BY id_ <include refid="global.limit"/>
+	</select>
+	
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM music_favorite
+	</select>
+</mapper>

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

@@ -5,15 +5,16 @@
 不要修改此文件。所有改动将在下次重新自动生成时丢失。
 -->
 <mapper namespace="com.yonge.cooleshow.biz.dal.dao.MusicSheetAccompanimentDao">
-
-    <resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.MusicSheetAccompaniment">
-        <id column="id" jdbcType="BIGINT" property="id" />
-        <result column="music_id_" jdbcType="BIGINT" property="musicId" />
-        <result column="instrument_" jdbcType="VARCHAR" property="instrument" />
-        <result column="accompaniment_url_" jdbcType="VARCHAR" property="accompanimentUrl" />
-        <result column="create_time_" jdbcType="TIMESTAMP" property="createTime" />
-        <result column="create_user_" jdbcType="BIGINT" property="createUser" />
-    </resultMap>
+	
+	<resultMap type="com.yonge.cooleshow.biz.dal.entity.MusicSheetAccompaniment" id="BaseResultMap">
+		<result column="id_" property="id" />
+		<result column="music_sheet_id_" property="musicSheetId" />
+		<result column="music_subject_" property="musicSubject" />
+		<result column="audio_file_url_" property="audioFileUrl" />
+		<result column="sort_number_" property="sortNumber" />
+		<result column="create_time_" property="createTime" />
+		<result column="create_by_" property="createBy" />
+	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
 	<select id="get" resultMap="BaseResultMap" >
@@ -24,62 +25,91 @@
 	<select id="findAll" resultMap="BaseResultMap">
 		SELECT * FROM music_sheet_accompaniment ORDER BY id_
 	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.yonge.cooleshow.biz.dal.entity.MusicSheetAccompaniment" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+
+    <delete id="delete" parameterType="MusicSheetAccompaniment">
+        delete from music_sheet_accompaniment
+        where 1=1
+        <if test="musicSheetId != null and musicSheetId != ''">
+            and music_sheet_id_ = #{musicSheetId}
+        </if>
+        <if test="musicSubject != null and musicSubject != ''">
+            and music_subject_ = #{musicSubject}
+        </if>
+        <if test="audioFileUrl != null and audioFileUrl != ''">
+            and audio_file_url_ = #{audioFileUrl}
+        </if>
+        <if test="sortNumber != null and sortNumber != ''">
+            and sort_number_ = #{sortNumber}
+        </if>
+        <if test="createTime != null and createTime != ''">
+            and create_time_ = #{createTime}
+        </if>
+        <if test="createBy != null and createBy != ''">
+            and create_by_ = #{createBy}
+        </if>
+    </delete>
+
+    <insert id="insert" parameterType="MusicSheetAccompaniment">
         insert into music_sheet_accompaniment
-        (music_id_,instrument_,accompaniment_url_,create_time_,create_user_)
+        (music_sheet_id_,music_subject_,audio_file_url_,sort_number_,create_time_,create_by_)
         values
-        (#{musicId},#{instrument},#{accompanimentUrl},sysdate(),#{createUser})
+        (#{musicSheetId},#{musicSubject},#{audioFileUrl},#{sortNumber},sysdate(),#{createBy})
     </insert>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.yonge.cooleshow.biz.dal.entity.MusicSheetAccompaniment">
-		UPDATE music_sheet_accompaniment
+
+    <update id="update" parameterType="MusicSheetAccompaniment">
+        update music_sheet_accompaniment
         <set>
-            <if test="musicId != null">
-                music_id_ = #{musicId},
+            <if test="musicSheetId != null">
+                music_sheet_id_ = #{musicSheetId},
             </if>
-            <if test="instrument != null and instrument != ''">
-                instrument_ = #{instrument},
+            <if test="musicSubject != null and musicSubject != ''">
+                music_subject_ = #{musicSubject},
             </if>
-            <if test="accompanimentUrl != null and accompanimentUrl != ''">
-                accompaniment_url_ = #{accompanimentUrl},
+            <if test="audioFileUrl != null and audioFileUrl != ''">
+                audio_file_url_ = #{audioFileUrl},
+            </if>
+            <if test="sortNumber != null">
+                sort_number_ = #{sortNumber},
             </if>
             <if test="createTime != null">
                 create_time_ = #{createTime},
             </if>
-            <if test="createUser != null">
-                create_user_ = #{createUser},
+            <if test="createBy != null">
+                create_by_ = #{createBy},
             </if>
         </set>
-       WHERE id_ = #{id}
-	</update>
-	
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
-		DELETE FROM music_sheet_accompaniment WHERE id_ = #{id} 
-	</delete>
+        where id = #{id}
+    </update>
 
-    <delete id="delete" parameterType="MusicSheetAccompaniment">
-        delete from music_sheet_accompaniment
+    <select id="findList" parameterType="MusicSheetAccompaniment" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List" />
+        from music_sheet_accompaniment
         where 1=1
-        <if test="musicId != null and musicId != ''">
-            and music_id_ = #{musicId}
+        <if test="musicSheetId != null">
+            and music_sheet_id_ = #{musicSheetId}
         </if>
-        <if test="instrument != null and instrument != ''">
-            and instrument_ = #{instrument}
+        <if test="musicSubject != null and musicSubject != ''">
+            and music_subject_ = #{musicSubject}
         </if>
-        <if test="accompanimentUrl != null and accompanimentUrl != ''">
-            and accompaniment_url_ = #{accompanimentUrl}
+        <if test="audioFileUrl != null and audioFileUrl != ''">
+            and audio_file_url_ = #{audioFileUrl}
         </if>
-        <if test="createTime != null and createTime != ''">
+        <if test="sortNumber != null">
+            and sort_number_ = #{sortNumber}
+        </if>
+        <if test="createTime != null">
             and create_time_ = #{createTime}
         </if>
-        <if test="createUser != null and createUser != ''">
-            and create_user_ = #{createUser}
+        <if test="createBy != null">
+            and create_by_ = #{createBy}
         </if>
-    </delete>
+    </select>
+	
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete" >
+		DELETE FROM music_sheet_accompaniment WHERE id_ = #{id} 
+	</delete>
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="BaseResultMap" parameterType="map">
@@ -90,25 +120,4 @@
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM music_sheet_accompaniment
 	</select>
-
-    <select id="findList" parameterType="MusicSheetAccompaniment" resultMap="BaseResultMap">
-        select *
-        from music_sheet_accompaniment
-        where 1=1
-        <if test="musicId != null">
-            and music_id_ = #{musicId}
-        </if>
-        <if test="instrument != null and instrument != ''">
-            and instrument_ = #{instrument}
-        </if>
-        <if test="accompanimentUrl != null and accompanimentUrl != ''">
-            and accompaniment_url_ = #{accompanimentUrl}
-        </if>
-        <if test="createTime != null">
-            and create_time_ = #{createTime}
-        </if>
-        <if test="createUser != null">
-            and create_user_ = #{createUser}
-        </if>
-    </select>
 </mapper>

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

@@ -8,10 +8,10 @@
 	
 	<resultMap type="com.yonge.cooleshow.biz.dal.entity.MusicSheet" id="BaseResultMap">
 		<result column="id_" property="id" />
-		<result column="music_name_" property="musicName" />
-		<result column="music_source_" property="musicSource" />
+		<result column="music_sheet_name_" property="musicSheetName" />
+		<result column="user_id_" property="userId" />
 		<result column="composer_" property="composer" />
-		<result column="music_instrument_" property="musicInstrument" />
+		<result column="music_subject_" property="musicSubject" />
 		<result column="audio_type_" property="audioType" />
 		<result column="music_tag_" property="musicTag" />
 		<result column="play_speed_" property="playSpeed" />
@@ -19,17 +19,17 @@
 		<result column="show_fingering_" property="showFingering" />
 		<result column="charge_type_" property="chargeType" />
 		<result column="audit_status_" property="auditStatus" />
-		<result column="order_no_" property="orderNo" />
+		<result column="sort_number_" property="sortNumber" />
 		<result column="top_flag_" property="topFlag" />
 		<result column="hot_flag_" property="hotFlag" />
 		<result column="music_price_" property="musicPrice" />
 		<result column="audio_file_url_" property="audioFileUrl" />
 		<result column="xml_file_url_" property="xmlFileUrl" />
-		<result column="mp3_has_beat_" property="mp3HasBeat" />
+		<result column="has_beat_" property="hasBeat" />
 		<result column="create_time_" property="createTime" />
-		<result column="create_user_" property="createUser" />
+		<result column="create_by_" property="createBy" />
 		<result column="update_time_" property="updateTime" />
-		<result column="update_user_" property="updateUser" />
+		<result column="update_by_" property="updateBy" />
 		<result column="remark_" property="remark" />
 	</resultMap>
 	
@@ -42,111 +42,21 @@
 	<select id="findAll" resultMap="BaseResultMap">
 		SELECT * FROM music_sheet ORDER BY id_
 	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.yonge.cooleshow.biz.dal.entity.MusicSheet" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-        insert into music_sheet
-        (music_name_,music_source_,composer_,music_instrument_,audio_type_,music_tag_,play_speed_,can_evaluate_,show_fingering_,charge_type_,audit_status_,order_no_,top_flag_,hot_flag_,music_price_,audio_file_url_,xml_file_url_,mp3_has_beat_,create_time_,create_user_,update_time_,update_user_,remark_)
-        values
-        (#{musicName},#{musicSource},#{composer},#{musicInstrument},#{audioType},#{musicTag},#{playSpeed},#{canEvaluate},#{showFingering},#{chargeType},#{auditStatus},#{orderNo},#{topFlag},#{hotFlag},#{musicPrice},#{audioFileUrl},#{xmlFileUrl},#{mp3HasBeat},sysdate(),#{createUser},#{updateTime},#{updateUser},#{remark})
-    </insert>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.yonge.cooleshow.biz.dal.entity.MusicSheet">
-		UPDATE music_sheet
-        <set>
-        <if test="musicName != null and musicName != ''">
-            music_name_ = #{musicName},
-        </if>
-        <if test="musicSource != null">
-            music_source_ = #{musicSource},
-        </if>
-        <if test="composer != null and composer != ''">
-            composer_ = #{composer},
-        </if>
-        <if test="musicInstrument != null and musicInstrument != ''">
-            music_instrument_ = #{musicInstrument},
-        </if>
-        <if test="audioType != null and audioType != ''">
-            audio_type_ = #{audioType},
-        </if>
-        <if test="musicTag != null and musicTag != ''">
-            music_tag_ = #{musicTag},
-        </if>
-        <if test="playSpeed != null">
-            play_speed_ = #{playSpeed},
-        </if>
-        <if test="canEvaluate != null">
-            can_evaluate_ = #{canEvaluate},
-        </if>
-        <if test="showFingering != null">
-            show_fingering_ = #{showFingering},
-        </if>
-        <if test="chargeType != null">
-            charge_type_ = #{chargeType},
-        </if>
-        <if test="auditStatus != null">
-            audit_status_ = #{auditStatus},
-        </if>
-        <if test="orderNo != null">
-            order_no_ = #{orderNo},
-        </if>
-        <if test="topFlag != null">
-            top_flag_ = #{topFlag},
-        </if>
-        <if test="hotFlag != null">
-            hot_flag_ = #{hotFlag},
-        </if>
-        <if test="musicPrice != null">
-            music_price_ = #{musicPrice},
-        </if>
-        <if test="audioFileUrl != null and audioFileUrl != ''">
-            audio_file_url_ = #{audioFileUrl},
-        </if>
-        <if test="xmlFileUrl != null and xmlFileUrl != ''">
-            xml_file_url_ = #{xmlFileUrl},
-        </if>
-        <if test="mp3HasBeat != null">
-            mp3_has_beat_ = #{mp3HasBeat},
-        </if>
-        <if test="createTime != null">
-            create_time_ = #{createTime},
-        </if>
-        <if test="createUser != null">
-            create_user_ = #{createUser},
-        </if>
-        <if test="updateTime != null">
-            update_time_ = #{updateTime},
-        </if>
-        <if test="updateUser != null">
-            update_user_ = #{updateUser},
-        </if>
-        <if test="remark != null and remark != ''">
-            remark_ = #{remark},
-        </if>
-        </set>
-        WHERE id_ = #{id}
-	</update>
-	
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
-		DELETE FROM music_sheet WHERE id_ = #{id} 
-	</delete>
 
     <delete id="delete" parameterType="MusicSheet">
         delete from music_sheet
         where 1=1
-        <if test="musicName != null and musicName != ''">
-            and music_name_ = #{musicName}
+        <if test="musicSheetName != null and musicSheetName != ''">
+            and music_sheet_name_ = #{musicSheetName}
         </if>
-        <if test="musicSource != null and musicSource != ''">
-            and music_source_ = #{musicSource}
+        <if test="userId != null and userId != ''">
+            and user_id_ = #{userId}
         </if>
         <if test="composer != null and composer != ''">
             and composer_ = #{composer}
         </if>
-        <if test="musicInstrument != null and musicInstrument != ''">
-            and music_instrument_ = #{musicInstrument}
+        <if test="musicSubject != null and musicSubject != ''">
+            and music_subject_ = #{musicSubject}
         </if>
         <if test="audioType != null and audioType != ''">
             and audio_type_ = #{audioType}
@@ -169,8 +79,8 @@
         <if test="auditStatus != null and auditStatus != ''">
             and audit_status_ = #{auditStatus}
         </if>
-        <if test="orderNo != null and orderNo != ''">
-            and order_no_ = #{orderNo}
+        <if test="sortNumber != null and sortNumber != ''">
+            and sort_number_ = #{sortNumber}
         </if>
         <if test="topFlag != null and topFlag != ''">
             and top_flag_ = #{topFlag}
@@ -187,52 +97,125 @@
         <if test="xmlFileUrl != null and xmlFileUrl != ''">
             and xml_file_url_ = #{xmlFileUrl}
         </if>
-        <if test="mp3HasBeat != null and mp3HasBeat != ''">
-            and mp3_has_beat_ = #{mp3HasBeat}
+        <if test="hasBeat != null and hasBeat != ''">
+            and has_beat_ = #{hasBeat}
         </if>
         <if test="createTime != null and createTime != ''">
             and create_time_ = #{createTime}
         </if>
-        <if test="createUser != null and createUser != ''">
-            and create_user_ = #{createUser}
+        <if test="createBy != null and createBy != ''">
+            and create_by_ = #{createBy}
         </if>
         <if test="updateTime != null and updateTime != ''">
             and update_time_ = #{updateTime}
         </if>
-        <if test="updateUser != null and updateUser != ''">
-            and update_user_ = #{updateUser}
+        <if test="updateBy != null and updateBy != ''">
+            and update_by_ = #{updateBy}
         </if>
         <if test="remark != null and remark != ''">
             and remark_ = #{remark}
         </if>
     </delete>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="BaseResultMap" parameterType="map">
-		SELECT * FROM music_sheet ORDER BY id_ <include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM music_sheet
-	</select>
+
+    <insert id="insert" parameterType="MusicSheet">
+        insert into music_sheet
+        (music_sheet_name_,user_id_,composer_,music_subject_,audio_type_,music_tag_,play_speed_,can_evaluate_,show_fingering_,charge_type_,audit_status_,sort_number_,top_flag_,hot_flag_,music_price_,audio_file_url_,xml_file_url_,has_beat_,create_time_,create_by_,update_time_,update_by_,remark_)
+        values
+        (#{musicSheetName},#{userId},#{composer},#{musicSubject},#{audioType},#{musicTag},#{playSpeed},#{canEvaluate},#{showFingering},#{chargeType},#{auditStatus},#{sortNumber},#{topFlag},#{hotFlag},#{musicPrice},#{audioFileUrl},#{xmlFileUrl},#{hasBeat},sysdate(),#{createBy},#{updateTime},#{updateBy},#{remark})
+    </insert>
+
+    <update id="update" parameterType="MusicSheet">
+        update music_sheet
+        <set>
+            <if test="musicSheetName != null and musicSheetName != ''">
+                music_sheet_name_ = #{musicSheetName},
+            </if>
+            <if test="userId != null">
+                user_id_ = #{userId},
+            </if>
+            <if test="composer != null and composer != ''">
+                composer_ = #{composer},
+            </if>
+            <if test="musicSubject != null and musicSubject != ''">
+                music_subject_ = #{musicSubject},
+            </if>
+            <if test="audioType != null and audioType != ''">
+                audio_type_ = #{audioType},
+            </if>
+            <if test="musicTag != null and musicTag != ''">
+                music_tag_ = #{musicTag},
+            </if>
+            <if test="playSpeed != null">
+                play_speed_ = #{playSpeed},
+            </if>
+            <if test="canEvaluate != null">
+                can_evaluate_ = #{canEvaluate},
+            </if>
+            <if test="showFingering != null">
+                show_fingering_ = #{showFingering},
+            </if>
+            <if test="chargeType != null">
+                charge_type_ = #{chargeType},
+            </if>
+            <if test="auditStatus != null">
+                audit_status_ = #{auditStatus},
+            </if>
+            <if test="sortNumber != null">
+                sort_number_ = #{sortNumber},
+            </if>
+            <if test="topFlag != null">
+                top_flag_ = #{topFlag},
+            </if>
+            <if test="hotFlag != null">
+                hot_flag_ = #{hotFlag},
+            </if>
+            <if test="musicPrice != null">
+                music_price_ = #{musicPrice},
+            </if>
+            <if test="audioFileUrl != null and audioFileUrl != ''">
+                audio_file_url_ = #{audioFileUrl},
+            </if>
+            <if test="xmlFileUrl != null and xmlFileUrl != ''">
+                xml_file_url_ = #{xmlFileUrl},
+            </if>
+            <if test="hasBeat != null">
+                has_beat_ = #{hasBeat},
+            </if>
+            <if test="createTime != null">
+                create_time_ = #{createTime},
+            </if>
+            <if test="createBy != null">
+                create_by_ = #{createBy},
+            </if>
+            <if test="updateTime != null">
+                update_time_ = #{updateTime},
+            </if>
+            <if test="updateBy != null">
+                update_by_ = #{updateBy},
+            </if>
+            <if test="remark != null and remark != ''">
+                remark_ = #{remark},
+            </if>
+        </set>
+        where id = #{id}
+    </update>
 
     <select id="findList" parameterType="MusicSheet" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List" />
         from music_sheet
         where 1=1
-        <if test="musicName != null and musicName != ''">
-            and music_name_ = #{musicName}
+        <if test="musicSheetName != null and musicSheetName != ''">
+            and music_sheet_name_ = #{musicSheetName}
         </if>
-        <if test="musicSource != null">
-            and music_source_ = #{musicSource}
+        <if test="userId != null">
+            and user_id_ = #{userId}
         </if>
         <if test="composer != null and composer != ''">
             and composer_ = #{composer}
         </if>
-        <if test="musicInstrument != null and musicInstrument != ''">
-            and music_instrument_ = #{musicInstrument}
+        <if test="musicSubject != null and musicSubject != ''">
+            and music_subject_ = #{musicSubject}
         </if>
         <if test="audioType != null and audioType != ''">
             and audio_type_ = #{audioType}
@@ -255,8 +238,8 @@
         <if test="auditStatus != null">
             and audit_status_ = #{auditStatus}
         </if>
-        <if test="orderNo != null">
-            and order_no_ = #{orderNo}
+        <if test="sortNumber != null">
+            and sort_number_ = #{sortNumber}
         </if>
         <if test="topFlag != null">
             and top_flag_ = #{topFlag}
@@ -273,23 +256,38 @@
         <if test="xmlFileUrl != null and xmlFileUrl != ''">
             and xml_file_url_ = #{xmlFileUrl}
         </if>
-        <if test="mp3HasBeat != null">
-            and mp3_has_beat_ = #{mp3HasBeat}
+        <if test="hasBeat != null">
+            and has_beat_ = #{hasBeat}
         </if>
         <if test="createTime != null">
             and create_time_ = #{createTime}
         </if>
-        <if test="createUser != null">
-            and create_user_ = #{createUser}
+        <if test="createBy != null">
+            and create_by_ = #{createBy}
         </if>
         <if test="updateTime != null">
             and update_time_ = #{updateTime}
         </if>
-        <if test="updateUser != null">
-            and update_user_ = #{updateUser}
+        <if test="updateBy != null">
+            and update_by_ = #{updateBy}
         </if>
         <if test="remark != null and remark != ''">
             and remark_ = #{remark}
         </if>
     </select>
+	
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete" >
+		DELETE FROM music_sheet WHERE id_ = #{id} 
+	</delete>
+	
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="BaseResultMap" parameterType="map">
+		SELECT * FROM music_sheet ORDER BY id_ <include refid="global.limit"/>
+	</select>
+	
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM music_sheet
+	</select>
 </mapper>

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

@@ -26,48 +26,6 @@
 	<select id="findAll" resultMap="BaseResultMap">
 		SELECT * FROM music_sheet_purchase_record ORDER BY id_
 	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.yonge.cooleshow.biz.dal.entity.MusicSheetPurchaseRecord" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-        insert into music_sheet_purchase_record
-        (music_sheet_id_,teacher_id_,order_no_,student_id_,purchase_time_,purchase_price_,order_status_)
-        values
-        (#{musicSheetId},#{teacherId},#{orderNo},#{studentId},#{purchaseTime},#{purchasePrice},#{orderStatus})
-    </insert>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.yonge.cooleshow.biz.dal.entity.MusicSheetPurchaseRecord">
-		UPDATE music_sheet_purchase_record
-        <set>
-        <if test="musicSheetId != null">
-            music_sheet_id_ = #{musicSheetId},
-        </if>
-        <if test="teacherId != null">
-            teacher_id_ = #{teacherId},
-        </if>
-        <if test="orderNo != null and orderNo != ''">
-            order_no_ = #{orderNo},
-        </if>
-        <if test="studentId != null">
-            student_id_ = #{studentId},
-        </if>
-        <if test="purchaseTime != null">
-            purchase_time_ = #{purchaseTime},
-        </if>
-        <if test="purchasePrice != null">
-            purchase_price_ = #{purchasePrice},
-        </if>
-        <if test="orderStatus != null">
-            order_status_ = #{orderStatus},
-        </if>
-        </set>
-        WHERE id_ = #{id}
-	</update>
-	
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
-		DELETE FROM music_sheet_purchase_record WHERE id_ = #{id} 
-	</delete>
 
     <delete id="delete" parameterType="MusicSheetPurchaseRecord">
         delete from music_sheet_purchase_record
@@ -94,16 +52,41 @@
             and order_status_ = #{orderStatus}
         </if>
     </delete>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="BaseResultMap" parameterType="map">
-		SELECT * FROM music_sheet_purchase_record ORDER BY id_ <include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM music_sheet_purchase_record
-	</select>
+
+    <insert id="insert" parameterType="MusicSheetPurchaseRecord">
+        insert into music_sheet_purchase_record
+        (music_sheet_id_,teacher_id_,order_no_,student_id_,purchase_time_,purchase_price_,order_status_)
+        values
+        (#{musicSheetId},#{teacherId},#{orderNo},#{studentId},#{purchaseTime},#{purchasePrice},#{orderStatus})
+    </insert>
+
+    <update id="update" parameterType="MusicSheetPurchaseRecord">
+        update music_sheet_purchase_record
+        <set>
+            <if test="musicSheetId != null">
+                music_sheet_id_ = #{musicSheetId},
+            </if>
+            <if test="teacherId != null">
+                teacher_id_ = #{teacherId},
+            </if>
+            <if test="orderNo != null and orderNo != ''">
+                order_no_ = #{orderNo},
+            </if>
+            <if test="studentId != null">
+                student_id_ = #{studentId},
+            </if>
+            <if test="purchaseTime != null">
+                purchase_time_ = #{purchaseTime},
+            </if>
+            <if test="purchasePrice != null">
+                purchase_price_ = #{purchasePrice},
+            </if>
+            <if test="orderStatus != null">
+                order_status_ = #{orderStatus},
+            </if>
+        </set>
+        where id = #{id}
+    </update>
 
     <select id="findList" parameterType="MusicSheetPurchaseRecord" resultMap="BaseResultMap">
         select
@@ -132,4 +115,19 @@
             and order_status_ = #{orderStatus}
         </if>
     </select>
+	
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete" >
+		DELETE FROM music_sheet_purchase_record WHERE id_ = #{id} 
+	</delete>
+	
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="BaseResultMap" parameterType="map">
+		SELECT * FROM music_sheet_purchase_record ORDER BY id_ <include refid="global.limit"/>
+	</select>
+	
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM music_sheet_purchase_record
+	</select>
 </mapper>

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

@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<!--
-这个文件是自动生成的。
-不要修改此文件。所有改动将在下次重新自动生成时丢失。
--->
-<mapper namespace="com.yonge.cooleshow.biz.dal.dao.StudentFavoriteAlbumDao">
-	
-	<resultMap type="com.yonge.cooleshow.biz.dal.entity.StudentFavoriteAlbum" id="BaseResultMap">
-		<result column="id_" property="id" />
-		<result column="student_id_" property="studentId" />
-		<result column="album_id_" property="albumId" />
-		<result column="favorite_time_" property="favoriteTime" />
-	</resultMap>
-	
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="BaseResultMap" >
-		SELECT * FROM student_favorite_album WHERE id_ = #{id} 
-	</select>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="BaseResultMap">
-		SELECT * FROM student_favorite_album ORDER BY id_
-	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.yonge.cooleshow.biz.dal.entity.StudentFavoriteAlbum" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-        insert into student_favorite_album
-        (student_id_,album_id_,favorite_time_)
-        values
-        (#{studentId},#{albumId},#{favoriteTime})
-	</insert>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.yonge.cooleshow.biz.dal.entity.StudentFavoriteAlbum">
-		UPDATE student_favorite_album
-        <set>
-        <if test="studentId != null">
-            student_id_ = #{studentId},
-        </if>
-        <if test="albumId != null">
-            album_id_ = #{albumId},
-        </if>
-        <if test="favoriteTime != null">
-            favorite_time_ = #{favoriteTime},
-        </if>
-        </set>
-        WHERE id_ = #{id}
-	</update>
-	
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
-		DELETE FROM student_favorite_album WHERE id_ = #{id} 
-	</delete>
-
-    <delete id="delete" parameterType="StudentFavoriteAlbum">
-        delete from student_favorite_album
-        where 1=1
-        <if test="studentId != null and studentId != ''">
-            and student_id_ = #{studentId}
-        </if>
-        <if test="albumId != null and albumId != ''">
-            and album_id_ = #{albumId}
-        </if>
-        <if test="favoriteTime != null and favoriteTime != ''">
-            and favorite_time_ = #{favoriteTime}
-        </if>
-    </delete>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="BaseResultMap" parameterType="map">
-		SELECT * FROM student_favorite_album ORDER BY id_ <include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM student_favorite_album
-	</select>
-
-    <select id="findList" parameterType="StudentFavoriteAlbum" resultMap="BaseResultMap">
-        select
-        <include refid="Base_Column_List" />
-        from student_favorite_album
-        where 1=1
-        <if test="studentId != null">
-            and student_id_ = #{studentId}
-        </if>
-        <if test="albumId != null">
-            and album_id_ = #{albumId}
-        </if>
-        <if test="favoriteTime != null">
-            and favorite_time_ = #{favoriteTime}
-        </if>
-    </select>
-</mapper>

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

@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<!--
-这个文件是自动生成的。
-不要修改此文件。所有改动将在下次重新自动生成时丢失。
--->
-<mapper namespace="com.yonge.cooleshow.biz.dal.dao.StudentFavoriteMusicDao">
-	
-	<resultMap type="com.yonge.cooleshow.biz.dal.entity.StudentFavoriteMusic" id="BaseResultMap">
-		<result column="id_" property="id" />
-		<result column="student_id_" property="studentId" />
-		<result column="sheet_id_" property="sheetId" />
-		<result column="favorite_time_" property="favoriteTime" />
-	</resultMap>
-	
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="BaseResultMap" >
-		SELECT * FROM student_favorite_music WHERE id_ = #{id} 
-	</select>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="BaseResultMap">
-		SELECT * FROM student_favorite_music ORDER BY id_
-	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.yonge.cooleshow.biz.dal.entity.StudentFavoriteMusic" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-        insert into student_favorite_music
-        (student_id_,sheet_id_,favorite_time_)
-        values
-        (#{studentId},#{sheetId},#{favoriteTime})
-	</insert>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.yonge.cooleshow.biz.dal.entity.StudentFavoriteMusic">
-        update student_favorite_music
-        <set>
-            <if test="studentId != null">
-                student_id_ = #{studentId},
-            </if>
-            <if test="sheetId != null">
-                sheet_id_ = #{sheetId},
-            </if>
-            <if test="favoriteTime != null">
-                favorite_time_ = #{favoriteTime},
-            </if>
-        </set>
-        where id_ = #{id}
-	</update>
-	
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
-		DELETE FROM student_favorite_music WHERE id_ = #{id} 
-	</delete>
-
-    <delete id="delete" parameterType="StudentFavoriteMusic">
-        delete from student_favorite_music
-        where 1=1
-        <if test="studentId != null and studentId != ''">
-            and student_id_ = #{studentId}
-        </if>
-        <if test="sheetId != null and sheetId != ''">
-            and sheet_id_ = #{sheetId}
-        </if>
-        <if test="favoriteTime != null and favoriteTime != ''">
-            and favorite_time_ = #{favoriteTime}
-        </if>
-    </delete>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="BaseResultMap" parameterType="map">
-		SELECT * FROM student_favorite_music ORDER BY id_ <include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM student_favorite_music
-	</select>
-
-    <select id="findList" parameterType="StudentFavoriteMusic" resultMap="BaseResultMap">
-        select
-        <include refid="Base_Column_List" />
-        from student_favorite_music
-        where 1=1
-        <if test="studentId != null">
-            and student_id_ = #{studentId}
-        </if>
-        <if test="sheetId != null">
-            and sheet_id_ = #{sheetId}
-        </if>
-        <if test="favoriteTime != null">
-            and favorite_time_ = #{favoriteTime}
-        </if>
-    </select>
-</mapper>

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

@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<!--
-这个文件是自动生成的。
-不要修改此文件。所有改动将在下次重新自动生成时丢失。
--->
-<mapper namespace="com.yonge.cooleshow.biz.dal.dao.VideoLessonDetailDao">
-	
-	<resultMap type="com.yonge.cooleshow.biz.dal.entity.VideoLessonDetail" id="BaseResultMap">
-		<result column="id_" property="id" />
-		<result column="lesson_id_" property="lessonId" />
-		<result column="lesson_title_" property="lessonTitle" />
-		<result column="lesson_content_" property="lessonContent" />
-		<result column="video_url_" property="videoUrl" />
-		<result column="cover_url_" property="coverUrl" />
-		<result column="order_num_" property="orderNum" />
-		<result column="teacher_id_" property="teacherId" />
-		<result column="create_time_" property="createTime" />
-		<result column="update_time_" property="updateTime" />
-	</resultMap>
-	
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="BaseResultMap" >
-		SELECT * FROM video_lesson_detail WHERE id_ = #{id} 
-	</select>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="BaseResultMap">
-		SELECT * FROM video_lesson_detail ORDER BY id_
-	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.yonge.cooleshow.biz.dal.entity.VideoLessonDetail" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-        insert into video_lesson_detail
-        (lesson_id_,lesson_title_,lesson_content_,video_url_,cover_url_,order_num_,teacher_id_,create_time_,update_time_)
-        values
-        (#{lessonId},#{lessonTitle},#{lessonContent},#{videoUrl},#{coverUrl},#{orderNum},#{teacherId},sysdate(),#{updateTime})
-    </insert>
-	
-	<!-- 根据主键查询一条记录 -->
-    <update id="update" parameterType="VideoLessonDetail">
-        update video_lesson_detail
-        <set>
-            <if test="lessonId != null">
-                lesson_id_ = #{lessonId},
-            </if>
-            <if test="lessonTitle != null and lessonTitle != ''">
-                lesson_title_ = #{lessonTitle},
-            </if>
-            <if test="lessonContent != null and lessonContent != ''">
-                lesson_content_ = #{lessonContent},
-            </if>
-            <if test="videoUrl != null and videoUrl != ''">
-                video_url_ = #{videoUrl},
-            </if>
-            <if test="coverUrl != null and coverUrl != ''">
-                cover_url_ = #{coverUrl},
-            </if>
-            <if test="orderNum != null">
-                order_num_ = #{orderNum},
-            </if>
-            <if test="teacherId != null">
-                teacher_id_ = #{teacherId},
-            </if>
-            <if test="createTime != null">
-                create_time_ = #{createTime},
-            </if>
-            <if test="updateTime != null">
-                update_time_ = #{updateTime},
-            </if>
-        </set>
-        where id_ = #{id}
-    </update>
-
-    <select id="findList" parameterType="VideoLessonDetail" resultMap="BaseResultMap">
-        select
-        <include refid="Base_Column_List" />
-        from video_lesson_detail
-        where 1=1
-        <if test="lessonId != null">
-            and lesson_id_ = #{lessonId}
-        </if>
-        <if test="lessonTitle != null and lessonTitle != ''">
-            and lesson_title_ = #{lessonTitle}
-        </if>
-        <if test="lessonContent != null and lessonContent != ''">
-            and lesson_content_ = #{lessonContent}
-        </if>
-        <if test="videoUrl != null and videoUrl != ''">
-            and video_url_ = #{videoUrl}
-        </if>
-        <if test="coverUrl != null and coverUrl != ''">
-            and cover_url_ = #{coverUrl}
-        </if>
-        <if test="orderNum != null">
-            and order_num_ = #{orderNum}
-        </if>
-        <if test="teacherId != null">
-            and teacher_id_ = #{teacherId}
-        </if>
-        <if test="createTime != null">
-            and create_time_ = #{createTime}
-        </if>
-        <if test="updateTime != null">
-            and update_time_ = #{updateTime}
-        </if>
-    </select>
-	
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
-		DELETE FROM video_lesson_detail WHERE id_ = #{id} 
-	</delete>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="BaseResultMap" parameterType="map">
-		SELECT * FROM video_lesson_detail ORDER BY id_ <include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM video_lesson_detail
-	</select>
-</mapper>

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

@@ -8,7 +8,7 @@
 	
 	<resultMap type="com.yonge.cooleshow.biz.dal.entity.VideoLessonEvaluate" id="BaseResultMap">
 		<result column="id_" property="id" />
-		<result column="video_item_id_" property="videoItemId" />
+		<result column="video_id_" property="videoId" />
 		<result column="student_id_" property="studentId" />
 		<result column="content_" property="content" />
 		<result column="evaluate_time_" property="evaluateTime" />
@@ -23,20 +23,36 @@
 	<select id="findAll" resultMap="BaseResultMap">
 		SELECT * FROM video_lesson_evaluate ORDER BY id_
 	</select>
-	
-	<!-- 向数据库增加一条记录 -->
+
+    <delete id="delete" parameterType="VideoLessonEvaluate">
+        delete from video_lesson_evaluate
+        where 1=1
+        <if test="videoId != null and videoId != ''">
+            and video_id_ = #{videoId}
+        </if>
+        <if test="studentId != null and studentId != ''">
+            and student_id_ = #{studentId}
+        </if>
+        <if test="content != null and content != ''">
+            and content_ = #{content}
+        </if>
+        <if test="evaluateTime != null and evaluateTime != ''">
+            and evaluate_time_ = #{evaluateTime}
+        </if>
+    </delete>
+
     <insert id="insert" parameterType="VideoLessonEvaluate">
         insert into video_lesson_evaluate
-        (video_item_id_,student_id_,content_,evaluate_time_)
+        (video_id_,student_id_,content_,evaluate_time_)
         values
-        (#{videoItemId},#{studentId},#{content},#{evaluateTime})
+        (#{videoId},#{studentId},#{content},#{evaluateTime})
     </insert>
 
     <update id="update" parameterType="VideoLessonEvaluate">
         update video_lesson_evaluate
         <set>
-            <if test="videoItemId != null">
-                video_item_id_ = #{videoItemId},
+            <if test="videoId != null">
+                video_id_ = #{videoId},
             </if>
             <if test="studentId != null">
                 student_id_ = #{studentId},
@@ -56,8 +72,8 @@
         <include refid="Base_Column_List" />
         from video_lesson_evaluate
         where 1=1
-        <if test="videoItemId != null">
-            and video_item_id_ = #{videoItemId}
+        <if test="videoId != null">
+            and video_id_ = #{videoId}
         </if>
         <if test="studentId != null">
             and student_id_ = #{studentId}
@@ -74,23 +90,6 @@
 	<delete id="delete" >
 		DELETE FROM video_lesson_evaluate WHERE id_ = #{id} 
 	</delete>
-
-    <delete id="delete" parameterType="VideoLessonEvaluate">
-        delete from video_lesson_evaluate
-        where 1=1
-        <if test="videoItemId != null and videoItemId != ''">
-            and video_item_id_ = #{videoItemId}
-        </if>
-        <if test="studentId != null and studentId != ''">
-            and student_id_ = #{studentId}
-        </if>
-        <if test="content != null and content != ''">
-            and content_ = #{content}
-        </if>
-        <if test="evaluateTime != null and evaluateTime != ''">
-            and evaluate_time_ = #{evaluateTime}
-        </if>
-    </delete>
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="BaseResultMap" parameterType="map">

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

@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!--
+这个文件是自动生成的。
+不要修改此文件。所有改动将在下次重新自动生成时丢失。
+-->
+<mapper namespace="com.yonge.cooleshow.biz.dal.dao.VideoLessonGroupDetailDao">
+	
+	<resultMap type="com.yonge.cooleshow.biz.dal.entity.VideoLessonGroupDetail" id="BaseResultMap">
+		<result column="id_" property="id" />
+		<result column="video_lesson_group_id_" property="videoLessonGroupId" />
+		<result column="video_title_" property="videoTitle" />
+		<result column="video_content_" property="videoContent" />
+		<result column="video_url_" property="videoUrl" />
+		<result column="cover_url_" property="coverUrl" />
+		<result column="charge_flag_" property="chargeFlag" />
+		<result column="sort_number_" property="sortNumber" />
+		<result column="teacher_id_" property="teacherId" />
+		<result column="create_time_" property="createTime" />
+		<result column="update_by_" property="updateBy" />
+		<result column="update_time_" property="updateTime" />
+	</resultMap>
+	
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="BaseResultMap" >
+		SELECT * FROM video_lesson_group_detail WHERE id_ = #{id} 
+	</select>
+	
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="BaseResultMap">
+		SELECT * FROM video_lesson_group_detail ORDER BY id_
+	</select>
+
+    <delete id="delete" parameterType="VideoLessonGroupDetail">
+        delete from video_lesson_group_detail
+        where 1=1
+        <if test="videoLessonGroupId != null and videoLessonGroupId != ''">
+            and video_lesson_group_id_ = #{videoLessonGroupId}
+        </if>
+        <if test="videoTitle != null and videoTitle != ''">
+            and video_title_ = #{videoTitle}
+        </if>
+        <if test="videoContent != null and videoContent != ''">
+            and video_content_ = #{videoContent}
+        </if>
+        <if test="videoUrl != null and videoUrl != ''">
+            and video_url_ = #{videoUrl}
+        </if>
+        <if test="coverUrl != null and coverUrl != ''">
+            and cover_url_ = #{coverUrl}
+        </if>
+        <if test="chargeFlag != null and chargeFlag != ''">
+            and charge_flag_ = #{chargeFlag}
+        </if>
+        <if test="sortNumber != null and sortNumber != ''">
+            and sort_number_ = #{sortNumber}
+        </if>
+        <if test="teacherId != null and teacherId != ''">
+            and teacher_id_ = #{teacherId}
+        </if>
+        <if test="createTime != null and createTime != ''">
+            and create_time_ = #{createTime}
+        </if>
+        <if test="updateBy != null and updateBy != ''">
+            and update_by_ = #{updateBy}
+        </if>
+        <if test="updateTime != null and updateTime != ''">
+            and update_time_ = #{updateTime}
+        </if>
+    </delete>
+
+    <insert id="insert" parameterType="VideoLessonGroupDetail">
+        insert into video_lesson_group_detail
+        (video_lesson_group_id_,video_title_,video_content_,video_url_,cover_url_,charge_flag_,sort_number_,teacher_id_,create_time_,update_by_,update_time_)
+        values
+        (#{videoLessonGroupId},#{videoTitle},#{videoContent},#{videoUrl},#{coverUrl},#{chargeFlag},#{sortNumber},#{teacherId},sysdate(),#{updateBy},#{updateTime})
+    </insert>
+
+    <update id="update" parameterType="VideoLessonGroupDetail">
+        update video_lesson_group_detail
+        <set>
+            <if test="videoLessonGroupId != null">
+                video_lesson_group_id_ = #{videoLessonGroupId},
+            </if>
+            <if test="videoTitle != null and videoTitle != ''">
+                video_title_ = #{videoTitle},
+            </if>
+            <if test="videoContent != null and videoContent != ''">
+                video_content_ = #{videoContent},
+            </if>
+            <if test="videoUrl != null and videoUrl != ''">
+                video_url_ = #{videoUrl},
+            </if>
+            <if test="coverUrl != null and coverUrl != ''">
+                cover_url_ = #{coverUrl},
+            </if>
+            <if test="chargeFlag != null">
+                charge_flag_ = #{chargeFlag},
+            </if>
+            <if test="sortNumber != null">
+                sort_number_ = #{sortNumber},
+            </if>
+            <if test="teacherId != null">
+                teacher_id_ = #{teacherId},
+            </if>
+            <if test="createTime != null">
+                create_time_ = #{createTime},
+            </if>
+            <if test="updateBy != null">
+                update_by_ = #{updateBy},
+            </if>
+            <if test="updateTime != null">
+                update_time_ = #{updateTime},
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+
+    <select id="findList" parameterType="VideoLessonGroupDetail" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List" />
+        from video_lesson_group_detail
+        where 1=1
+        <if test="videoLessonGroupId != null">
+            and video_lesson_group_id_ = #{videoLessonGroupId}
+        </if>
+        <if test="videoTitle != null and videoTitle != ''">
+            and video_title_ = #{videoTitle}
+        </if>
+        <if test="videoContent != null and videoContent != ''">
+            and video_content_ = #{videoContent}
+        </if>
+        <if test="videoUrl != null and videoUrl != ''">
+            and video_url_ = #{videoUrl}
+        </if>
+        <if test="coverUrl != null and coverUrl != ''">
+            and cover_url_ = #{coverUrl}
+        </if>
+        <if test="chargeFlag != null">
+            and charge_flag_ = #{chargeFlag}
+        </if>
+        <if test="sortNumber != null">
+            and sort_number_ = #{sortNumber}
+        </if>
+        <if test="teacherId != null">
+            and teacher_id_ = #{teacherId}
+        </if>
+        <if test="createTime != null">
+            and create_time_ = #{createTime}
+        </if>
+        <if test="updateBy != null">
+            and update_by_ = #{updateBy}
+        </if>
+        <if test="updateTime != null">
+            and update_time_ = #{updateTime}
+        </if>
+    </select>
+	
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete" >
+		DELETE FROM video_lesson_group_detail WHERE id_ = #{id} 
+	</delete>
+	
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="BaseResultMap" parameterType="map">
+		SELECT * FROM video_lesson_group_detail ORDER BY id_ <include refid="global.limit"/>
+	</select>
+	
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM video_lesson_group_detail
+	</select>
+</mapper>

cooleshow-user/user-biz/src/main/resources/config/mybatis/VideoLessonMapper.xml → cooleshow-user/user-biz/src/main/resources/config/mybatis/VideoLessonGroupMapper.xml

@@ -4,18 +4,18 @@
 这个文件是自动生成的。
 不要修改此文件。所有改动将在下次重新自动生成时丢失。
 -->
-<mapper namespace="com.yonge.cooleshow.biz.dal.dao.VideoLessonDao">
+<mapper namespace="com.yonge.cooleshow.biz.dal.dao.VideoLessonGroupDao">
 	
-	<resultMap type="com.yonge.cooleshow.biz.dal.entity.VideoLesson" id="BaseResultMap">
+	<resultMap type="com.yonge.cooleshow.biz.dal.entity.VideoLessonGroup" id="BaseResultMap">
 		<result column="id_" property="id" />
 		<result column="lesson_name_" property="lessonName" />
-		<result column="lesson_instrument_" property="lessonInstrument" />
+		<result column="lesson_subject_" property="lessonSubject" />
 		<result column="lesson_desc_" property="lessonDesc" />
 		<result column="lesson_price_" property="lessonPrice" />
 		<result column="lesson_cover_url_" property="lessonCoverUrl" />
 		<result column="teacher_id_" property="teacherId" />
 		<result column="lesson_count_" property="lessonCount" />
-		<result column="order_no_" property="orderNo" />
+		<result column="sort_number_" property="sortNumber" />
 		<result column="lesson_tag_" property="lessonTag" />
 		<result column="top_flag_" property="topFlag" />
 		<result column="hot_flag_" property="hotFlag" />
@@ -26,30 +26,76 @@
 	
 	<!-- 根据主键查询一条记录 -->
 	<select id="get" resultMap="BaseResultMap" >
-		SELECT * FROM video_lesson WHERE id_ = #{id} 
+		SELECT * FROM video_lesson_group WHERE id_ = #{id} 
 	</select>
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="BaseResultMap">
-		SELECT * FROM video_lesson ORDER BY id_
+		SELECT * FROM video_lesson_group ORDER BY id_
 	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-    <insert id="insert" parameterType="VideoLesson">
-        insert into video_lesson
-        (lesson_name_,lesson_instrument_,lesson_desc_,lesson_price_,lesson_cover_url_,teacher_id_,lesson_count_,order_no_,lesson_tag_,top_flag_,hot_flag_,audit_status_,create_time_,update_time_)
+
+    <delete id="delete" parameterType="VideoLessonGroup">
+        delete from video_lesson_group
+        where 1=1
+        <if test="lessonName != null and lessonName != ''">
+            and lesson_name_ = #{lessonName}
+        </if>
+        <if test="lessonSubject != null and lessonSubject != ''">
+            and lesson_subject_ = #{lessonSubject}
+        </if>
+        <if test="lessonDesc != null and lessonDesc != ''">
+            and lesson_desc_ = #{lessonDesc}
+        </if>
+        <if test="lessonPrice != null and lessonPrice != ''">
+            and lesson_price_ = #{lessonPrice}
+        </if>
+        <if test="lessonCoverUrl != null and lessonCoverUrl != ''">
+            and lesson_cover_url_ = #{lessonCoverUrl}
+        </if>
+        <if test="teacherId != null and teacherId != ''">
+            and teacher_id_ = #{teacherId}
+        </if>
+        <if test="lessonCount != null and lessonCount != ''">
+            and lesson_count_ = #{lessonCount}
+        </if>
+        <if test="sortNumber != null and sortNumber != ''">
+            and sort_number_ = #{sortNumber}
+        </if>
+        <if test="lessonTag != null and lessonTag != ''">
+            and lesson_tag_ = #{lessonTag}
+        </if>
+        <if test="topFlag != null and topFlag != ''">
+            and top_flag_ = #{topFlag}
+        </if>
+        <if test="hotFlag != null and hotFlag != ''">
+            and hot_flag_ = #{hotFlag}
+        </if>
+        <if test="auditStatus != null and auditStatus != ''">
+            and audit_status_ = #{auditStatus}
+        </if>
+        <if test="createTime != null and createTime != ''">
+            and create_time_ = #{createTime}
+        </if>
+        <if test="updateTime != null and updateTime != ''">
+            and update_time_ = #{updateTime}
+        </if>
+    </delete>
+
+    <insert id="insert" parameterType="VideoLessonGroup">
+        insert into video_lesson_group
+        (lesson_name_,lesson_subject_,lesson_desc_,lesson_price_,lesson_cover_url_,teacher_id_,lesson_count_,sort_number_,lesson_tag_,top_flag_,hot_flag_,audit_status_,create_time_,update_time_)
         values
-        (#{lessonName},#{lessonInstrument},#{lessonDesc},#{lessonPrice},#{lessonCoverUrl},#{teacherId},#{lessonCount},#{orderNo},#{lessonTag},#{topFlag},#{hotFlag},#{auditStatus},sysdate(),#{updateTime})
+        (#{lessonName},#{lessonSubject},#{lessonDesc},#{lessonPrice},#{lessonCoverUrl},#{teacherId},#{lessonCount},#{sortNumber},#{lessonTag},#{topFlag},#{hotFlag},#{auditStatus},sysdate(),#{updateTime})
     </insert>
 
-    <update id="update" parameterType="VideoLesson">
-        update video_lesson
+    <update id="update" parameterType="VideoLessonGroup">
+        update video_lesson_group
         <set>
             <if test="lessonName != null and lessonName != ''">
                 lesson_name_ = #{lessonName},
             </if>
-            <if test="lessonInstrument != null and lessonInstrument != ''">
-                lesson_instrument_ = #{lessonInstrument},
+            <if test="lessonSubject != null and lessonSubject != ''">
+                lesson_subject_ = #{lessonSubject},
             </if>
             <if test="lessonDesc != null and lessonDesc != ''">
                 lesson_desc_ = #{lessonDesc},
@@ -66,8 +112,8 @@
             <if test="lessonCount != null">
                 lesson_count_ = #{lessonCount},
             </if>
-            <if test="orderNo != null">
-                order_no_ = #{orderNo},
+            <if test="sortNumber != null">
+                sort_number_ = #{sortNumber},
             </if>
             <if test="lessonTag != null and lessonTag != ''">
                 lesson_tag_ = #{lessonTag},
@@ -88,19 +134,19 @@
                 update_time_ = #{updateTime},
             </if>
         </set>
-        where id_ = #{id}
+        where id = #{id}
     </update>
 
-    <select id="findList" parameterType="VideoLesson" resultMap="BaseResultMap">
+    <select id="findList" parameterType="VideoLessonGroup" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List" />
-        from video_lesson
+        from video_lesson_group
         where 1=1
         <if test="lessonName != null and lessonName != ''">
             and lesson_name_ = #{lessonName}
         </if>
-        <if test="lessonInstrument != null and lessonInstrument != ''">
-            and lesson_instrument_ = #{lessonInstrument}
+        <if test="lessonSubject != null and lessonSubject != ''">
+            and lesson_subject_ = #{lessonSubject}
         </if>
         <if test="lessonDesc != null and lessonDesc != ''">
             and lesson_desc_ = #{lessonDesc}
@@ -117,8 +163,8 @@
         <if test="lessonCount != null">
             and lesson_count_ = #{lessonCount}
         </if>
-        <if test="orderNo != null">
-            and order_no_ = #{orderNo}
+        <if test="sortNumber != null">
+            and sort_number_ = #{sortNumber}
         </if>
         <if test="lessonTag != null and lessonTag != ''">
             and lesson_tag_ = #{lessonTag}
@@ -142,16 +188,16 @@
 	
 	<!-- 根据主键删除一条记录 -->
 	<delete id="delete" >
-		DELETE FROM video_lesson WHERE id_ = #{id} 
+		DELETE FROM video_lesson_group WHERE id_ = #{id} 
 	</delete>
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="BaseResultMap" parameterType="map">
-		SELECT * FROM video_lesson ORDER BY id_ <include refid="global.limit"/>
+		SELECT * FROM video_lesson_group ORDER BY id_ <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM video_lesson
+		SELECT COUNT(*) FROM video_lesson_group
 	</select>
 </mapper>

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

@@ -8,7 +8,7 @@
 	
 	<resultMap type="com.yonge.cooleshow.biz.dal.entity.VideoLessonPurchaseRecord" id="BaseResultMap">
 		<result column="id_" property="id" />
-		<result column="lesson_id_" property="lessonId" />
+		<result column="video_lesson_group_id_" property="videoLessonGroupId" />
 		<result column="student_id_" property="studentId" />
 		<result column="purchase_time_" property="purchaseTime" />
 		<result column="pay_money_" property="payMoney" />
@@ -25,20 +25,42 @@
 	<select id="findAll" resultMap="BaseResultMap">
 		SELECT * FROM video_lesson_purchase_record ORDER BY id_
 	</select>
-	
-	<!-- 向数据库增加一条记录 -->
+
+    <delete id="delete" parameterType="VideoLessonPurchaseRecord">
+        delete from video_lesson_purchase_record
+        where 1=1
+        <if test="videoLessonGroupId != null and videoLessonGroupId != ''">
+            and video_lesson_group_id_ = #{videoLessonGroupId}
+        </if>
+        <if test="studentId != null and studentId != ''">
+            and student_id_ = #{studentId}
+        </if>
+        <if test="purchaseTime != null and purchaseTime != ''">
+            and purchase_time_ = #{purchaseTime}
+        </if>
+        <if test="payMoney != null and payMoney != ''">
+            and pay_money_ = #{payMoney}
+        </if>
+        <if test="orderNo != null and orderNo != ''">
+            and order_no_ = #{orderNo}
+        </if>
+        <if test="orderStatus != null and orderStatus != ''">
+            and order_status_ = #{orderStatus}
+        </if>
+    </delete>
+
     <insert id="insert" parameterType="VideoLessonPurchaseRecord">
         insert into video_lesson_purchase_record
-        (lesson_id_,student_id_,purchase_time_,pay_money_,order_no_,order_status_)
+        (video_lesson_group_id_,student_id_,purchase_time_,pay_money_,order_no_,order_status_)
         values
-        (#{lessonId},#{studentId},#{purchaseTime},#{payMoney},#{orderNo},#{orderStatus})
+        (#{videoLessonGroupId},#{studentId},#{purchaseTime},#{payMoney},#{orderNo},#{orderStatus})
     </insert>
 
     <update id="update" parameterType="VideoLessonPurchaseRecord">
         update video_lesson_purchase_record
         <set>
-            <if test="lessonId != null">
-                lesson_id_ = #{lessonId},
+            <if test="videoLessonGroupId != null">
+                video_lesson_group_id_ = #{videoLessonGroupId},
             </if>
             <if test="studentId != null">
                 student_id_ = #{studentId},
@@ -56,7 +78,7 @@
                 order_status_ = #{orderStatus},
             </if>
         </set>
-        where id_ = #{id}
+        where id = #{id}
     </update>
 
     <select id="findList" parameterType="VideoLessonPurchaseRecord" resultMap="BaseResultMap">
@@ -64,8 +86,8 @@
         <include refid="Base_Column_List" />
         from video_lesson_purchase_record
         where 1=1
-        <if test="lessonId != null">
-            and lesson_id_ = #{lessonId}
+        <if test="videoLessonGroupId != null">
+            and video_lesson_group_id_ = #{videoLessonGroupId}
         </if>
         <if test="studentId != null">
             and student_id_ = #{studentId}
@@ -88,29 +110,6 @@
 	<delete id="delete" >
 		DELETE FROM video_lesson_purchase_record WHERE id_ = #{id} 
 	</delete>
-
-    <delete id="delete" parameterType="VideoLessonPurchaseRecord">
-        delete from video_lesson_purchase_record
-        where 1=1
-        <if test="lessonId != null and lessonId != ''">
-            and lesson_id_ = #{lessonId}
-        </if>
-        <if test="studentId != null and studentId != ''">
-            and student_id_ = #{studentId}
-        </if>
-        <if test="purchaseTime != null and purchaseTime != ''">
-            and purchase_time_ = #{purchaseTime}
-        </if>
-        <if test="payMoney != null and payMoney != ''">
-            and pay_money_ = #{payMoney}
-        </if>
-        <if test="orderNo != null and orderNo != ''">
-            and order_no_ = #{orderNo}
-        </if>
-        <if test="orderStatus != null and orderStatus != ''">
-            and order_status_ = #{orderStatus}
-        </if>
-    </delete>
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="BaseResultMap" parameterType="map">

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

@@ -8,10 +8,10 @@
 	
 	<resultMap type="com.yonge.cooleshow.biz.dal.entity.VideoLessonStudyRecord" id="BaseResultMap">
 		<result column="id_" property="id" />
-		<result column="lesson_id" property="lessonId" />
+		<result column="video_lesson_group_id_" property="videoLessonGroupId" />
 		<result column="video_id_" property="videoId" />
 		<result column="student_id_" property="studentId" />
-		<result column="lesson_finished_" property="lessonFinished" />
+		<result column="finish_flag_" property="finishFlag" />
 		<result column="start_time_" property="startTime" />
 		<result column="finish_time_" property="finishTime" />
 	</resultMap>
@@ -29,8 +29,8 @@
     <delete id="delete" parameterType="VideoLessonStudyRecord">
         delete from video_lesson_study_record
         where 1=1
-        <if test="lessonId != null and lessonId != ''">
-            and lesson_id = #{lessonId}
+        <if test="videoLessonGroupId != null and videoLessonGroupId != ''">
+            and video_lesson_group_id_ = #{videoLessonGroupId}
         </if>
         <if test="videoId != null and videoId != ''">
             and video_id_ = #{videoId}
@@ -38,8 +38,8 @@
         <if test="studentId != null and studentId != ''">
             and student_id_ = #{studentId}
         </if>
-        <if test="lessonFinished != null and lessonFinished != ''">
-            and lesson_finished_ = #{lessonFinished}
+        <if test="finishFlag != null and finishFlag != ''">
+            and finish_flag_ = #{finishFlag}
         </if>
         <if test="startTime != null and startTime != ''">
             and start_time_ = #{startTime}
@@ -51,16 +51,16 @@
 
     <insert id="insert" parameterType="VideoLessonStudyRecord">
         insert into video_lesson_study_record
-        (lesson_id,video_id_,student_id_,lesson_finished_,start_time_,finish_time_)
+        (video_lesson_group_id_,video_id_,student_id_,finish_flag_,start_time_,finish_time_)
         values
-        (#{lessonId},#{videoId},#{studentId},#{lessonFinished},#{startTime},#{finishTime})
+        (#{videoLessonGroupId},#{videoId},#{studentId},#{finishFlag},#{startTime},#{finishTime})
     </insert>
 
     <update id="update" parameterType="VideoLessonStudyRecord">
         update video_lesson_study_record
         <set>
-            <if test="lessonId != null">
-                lesson_id = #{lessonId},
+            <if test="videoLessonGroupId != null">
+                video_lesson_group_id_ = #{videoLessonGroupId},
             </if>
             <if test="videoId != null">
                 video_id_ = #{videoId},
@@ -68,8 +68,8 @@
             <if test="studentId != null">
                 student_id_ = #{studentId},
             </if>
-            <if test="lessonFinished != null">
-                lesson_finished_ = #{lessonFinished},
+            <if test="finishFlag != null">
+                finish_flag_ = #{finishFlag},
             </if>
             <if test="startTime != null">
                 start_time_ = #{startTime},
@@ -86,8 +86,8 @@
         <include refid="Base_Column_List" />
         from video_lesson_study_record
         where 1=1
-        <if test="lessonId != null">
-            and lesson_id = #{lessonId}
+        <if test="videoLessonGroupId != null">
+            and video_lesson_group_id_ = #{videoLessonGroupId}
         </if>
         <if test="videoId != null">
             and video_id_ = #{videoId}
@@ -95,8 +95,8 @@
         <if test="studentId != null">
             and student_id_ = #{studentId}
         </if>
-        <if test="lessonFinished != null">
-            and lesson_finished_ = #{lessonFinished}
+        <if test="finishFlag != null">
+            and finish_flag_ = #{finishFlag}
         </if>
         <if test="startTime != null">
             and start_time_ = #{startTime}