代码生成

cooleshow-common/pom.xml

@@ -43,6 +43,10 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+		<dependency>
+			<groupId>redis.clients</groupId>
+			<artifactId>jedis</artifactId>
+		</dependency>
 		<!-- Redis缓存整合结束 -->
 
 		<dependency>
@@ -54,12 +58,7 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-openfeign</artifactId>
 		</dependency>
-		
-		<dependency>
-			<groupId>redis.clients</groupId>
-			<artifactId>jedis</artifactId>
-		</dependency>
-		
+
 		<dependency>
 			<groupId>org.springframework.security.oauth</groupId>
 			<artifactId>spring-security-oauth2</artifactId>

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/MusicSheetController.java

@@ -31,7 +31,7 @@ public class MusicSheetController extends BaseController {
         }
 
         musicSheet.setCreateBy(0L);
-        musicSheetService.insert(musicSheet);
+        //musicSheetService.insert(musicSheet);
         return succeed();
     }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/config/MyBatisPlusConfig.java

@@ -31,7 +31,7 @@ public class MyBatisPlusConfig {
     @Bean
     @Primary
     public PaginationInterceptor paginationInterceptor() {
-        plusProperties.setMapperLocations(new String[]{"classpath*:/config/mybatis/*.xml"});
+        plusProperties.setMapperLocations(new String[]{"classpath*:config/mybatis/*.xml"});
         plusProperties.setTypeAliasesPackage("com.yonge.cooleshow.biz.dal.entity");
         MybatisConfiguration mybatisConfiguration = new MybatisConfiguration();
         mybatisConfiguration.setMapUnderscoreToCamelCase(true);
@@ -39,19 +39,4 @@ public class MyBatisPlusConfig {
         plusProperties.setConfiguration(mybatisConfiguration);
         return new PaginationInterceptor();
     }
-
-    @Bean
-    public SqlSessionFactory sqlSessionFactory(DataSource dataSource) throws Exception {
-        SqlSessionFactoryBean sqlSessionFactoryBean = new SqlSessionFactoryBean();
-        sqlSessionFactoryBean.setDataSource(dataSource);
-        sqlSessionFactoryBean.setTypeAliasesPackage("com.yonge.cooleshow.biz.dal.entity");
-
-        MybatisConfiguration configuration = new MybatisConfiguration();
-        configuration.setDefaultScriptingLanguage(MybatisXMLLanguageDriver.class);
-        configuration.setJdbcTypeForNull(JdbcType.NULL);
-        sqlSessionFactoryBean.setConfiguration(configuration);
-
-        sqlSessionFactoryBean.setTransactionFactory(new SpringManagedTransactionFactory());
-        return sqlSessionFactoryBean.getObject();
-    }
 }

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

@@ -1,9 +1,16 @@
 package com.yonge.cooleshow.biz.dal.dao;
 
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.biz.dal.entity.AlbumFavorite;
 
-public interface AlbumFavoriteDao extends BaseDAO<Long, AlbumFavorite> {
+public interface AlbumFavoriteDao extends BaseMapper<AlbumFavorite>{
 
+	/**
+	 * 自定义分页
+	 */
+	List<AlbumFavorite> selectPage(IPage page, AlbumFavorite albumFavorite);
 	
 }

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

@@ -1,9 +1,16 @@
 package com.yonge.cooleshow.biz.dal.dao;
 
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.biz.dal.entity.AlbumMusicRelate;
 
-public interface AlbumMusicRelateDao extends BaseDAO<Long, AlbumMusicRelate> {
+public interface AlbumMusicRelateDao extends BaseMapper<AlbumMusicRelate>{
 
+	/**
+	 * 自定义分页
+	 */
+	List<AlbumMusicRelate> selectPage(IPage page, AlbumMusicRelate albumMusicRelate);
 	
 }

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

@@ -1,9 +1,16 @@
 package com.yonge.cooleshow.biz.dal.dao;
 
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.biz.dal.entity.MusicAlbum;
 
-public interface MusicAlbumDao extends BaseDAO<Long, MusicAlbum> {
+public interface MusicAlbumDao extends BaseMapper<MusicAlbum>{
 
+	/**
+	 * 自定义分页
+	 */
+	List<MusicAlbum> selectPage(IPage page, MusicAlbum musicAlbum);
 	
 }

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

@@ -1,9 +1,16 @@
 package com.yonge.cooleshow.biz.dal.dao;
 
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.biz.dal.entity.MusicFavorite;
 
-public interface MusicFavoriteDao extends BaseDAO<Long, MusicFavorite> {
+public interface MusicFavoriteDao extends BaseMapper<MusicFavorite>{
 
+	/**
+	 * 自定义分页
+	 */
+	List<MusicFavorite> selectPage(IPage page, MusicFavorite musicFavorite);
 	
 }

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

@@ -1,9 +1,16 @@
 package com.yonge.cooleshow.biz.dal.dao;
 
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.biz.dal.entity.MusicSheetAccompaniment;
 
-public interface MusicSheetAccompanimentDao extends BaseDAO<Long, MusicSheetAccompaniment> {
+public interface MusicSheetAccompanimentDao extends BaseMapper<MusicSheetAccompaniment>{
 
+	/**
+	 * 自定义分页
+	 */
+	List<MusicSheetAccompaniment> selectPage(IPage page, MusicSheetAccompaniment musicSheetAccompaniment);
 	
 }

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

@@ -1,9 +1,16 @@
 package com.yonge.cooleshow.biz.dal.dao;
 
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
 
-public interface MusicSheetDao extends BaseDAO<Long, MusicSheet> {
+public interface MusicSheetDao extends BaseMapper<MusicSheet>{
 
+	/**
+	 * 自定义分页
+	 */
+	List<MusicSheet> selectPage(IPage page, MusicSheet musicSheet);
 	
 }

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

@@ -1,9 +1,16 @@
 package com.yonge.cooleshow.biz.dal.dao;
 
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.biz.dal.entity.MusicSheetPurchaseRecord;
 
-public interface MusicSheetPurchaseRecordDao extends BaseDAO<Long, MusicSheetPurchaseRecord> {
+public interface MusicSheetPurchaseRecordDao extends BaseMapper<MusicSheetPurchaseRecord>{
 
+	/**
+	 * 自定义分页
+	 */
+	List<MusicSheetPurchaseRecord> selectPage(IPage page, MusicSheetPurchaseRecord musicSheetPurchaseRecord);
 	
 }

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

@@ -5,12 +5,15 @@ import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.biz.dal.entity.Teacher;
+import org.apache.ibatis.annotations.Param;
 
-public interface TeacherDao extends BaseMapper<Teacher>{
+public interface TeacherDao extends BaseMapper<Teacher> {
+
+    /**
+     * 自定义分页
+     */
+    List<Teacher> selectPage(@Param("page") IPage page, @Param("param") Teacher teacher);
+
+    Teacher detail1(@Param("userId") Integer userId);
 
-	/**
-	 * 自定义分页
-	 */
-	List<Teacher> selectPage(IPage page, Teacher teacher);
-	
 }

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

@@ -1,9 +1,16 @@
 package com.yonge.cooleshow.biz.dal.dao;
 
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.biz.dal.entity.VideoLessonEvaluate;
 
-public interface VideoLessonEvaluateDao extends BaseDAO<Long, VideoLessonEvaluate> {
+public interface VideoLessonEvaluateDao extends BaseMapper<VideoLessonEvaluate>{
 
+	/**
+	 * 自定义分页
+	 */
+	List<VideoLessonEvaluate> selectPage(IPage page, VideoLessonEvaluate videoLessonEvaluate);
 	
 }

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

@@ -1,9 +1,16 @@
 package com.yonge.cooleshow.biz.dal.dao;
 
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.biz.dal.entity.VideoLessonGroup;
 
-public interface VideoLessonGroupDao extends BaseDAO<Long, VideoLessonGroup> {
+public interface VideoLessonGroupDao extends BaseMapper<VideoLessonGroup>{
 
+	/**
+	 * 自定义分页
+	 */
+	List<VideoLessonGroup> selectPage(IPage page, VideoLessonGroup videoLessonGroup);
 	
 }

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

@@ -1,9 +1,16 @@
 package com.yonge.cooleshow.biz.dal.dao;
 
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.biz.dal.entity.VideoLessonGroupDetail;
 
-public interface VideoLessonGroupDetailDao extends BaseDAO<Long, VideoLessonGroupDetail> {
+public interface VideoLessonGroupDetailDao extends BaseMapper<VideoLessonGroupDetail>{
 
+	/**
+	 * 自定义分页
+	 */
+	List<VideoLessonGroupDetail> selectPage(IPage page, VideoLessonGroupDetail videoLessonGroupDetail);
 	
 }

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

@@ -1,9 +1,16 @@
 package com.yonge.cooleshow.biz.dal.dao;
 
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.biz.dal.entity.VideoLessonPurchaseRecord;
 
-public interface VideoLessonPurchaseRecordDao extends BaseDAO<Long, VideoLessonPurchaseRecord> {
+public interface VideoLessonPurchaseRecordDao extends BaseMapper<VideoLessonPurchaseRecord>{
 
+	/**
+	 * 自定义分页
+	 */
+	List<VideoLessonPurchaseRecord> selectPage(IPage page, VideoLessonPurchaseRecord videoLessonPurchaseRecord);
 	
 }

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

@@ -1,9 +1,16 @@
 package com.yonge.cooleshow.biz.dal.dao;
 
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.biz.dal.entity.VideoLessonStudyRecord;
 
-public interface VideoLessonStudyRecordDao extends BaseDAO<Long, VideoLessonStudyRecord> {
+public interface VideoLessonStudyRecordDao extends BaseMapper<VideoLessonStudyRecord>{
 
+	/**
+	 * 自定义分页
+	 */
+	List<VideoLessonStudyRecord> selectPage(IPage page, VideoLessonStudyRecord videoLessonStudyRecord);
 	
 }

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

@@ -1,71 +1,65 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
- * 对应数据库表(album_favorite):
+ * 专辑收藏表
  */
-public class AlbumFavorite {
+@Data
+@TableName("album_favorite")
+@ApiModel(value = "AlbumFavorite对象", description = "专辑收藏表")
+public class AlbumFavorite implements Serializable {
+	private static final long serialVersionUID = 1L;
+    /** 
+    * 主键 
+    */
+    @ApiModelProperty("主键 ")
+    @TableId(value = "id_", type = IdType.UUID)
+    private Long id;
+    /** 
+    * 用户ID(目前只是学生ID) 
+    */
+    @ApiModelProperty("用户ID(目前只是学生ID) ")
+	@TableField(value = "user_id_")
+    private Long userId;
+    /** 
+    * 专辑ID 
+    */
+    @ApiModelProperty("专辑ID ")
+	@TableField(value = "album_id_")
+    private Long albumId;
+    /** 
+    * 收藏时间 
+    */
+    @ApiModelProperty("收藏时间 ")
+	@TableField(value = "favorite_time_")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date favoriteTime;
+    /** 
+    * 是否收藏 
+    */
+    @ApiModelProperty("是否收藏 ")
+	@TableField(value = "favorite_flag_")
+    private Byte favoriteFlag;
 
-	@ApiModelProperty(value = "主键",required = false)
-	private Long id;
-	
-	@ApiModelProperty(value = "用户ID(目前只是学生ID)",required = false)
-	private Long userId;
-	
-	@ApiModelProperty(value = "专辑ID",required = false)
-	private Long albumId;
-	
-	@ApiModelProperty(value = "收藏时间",required = false)
-	private java.util.Date favoriteTime;
-	
-	@ApiModelProperty(value = "是否收藏",required = false)
-	private boolean favoriteFlag;
-	
-	public void setId(Long id){
-		this.id = id;
-	}
+    @Override
+    public String toString() {
+        return "AlbumFavorite{" +
+				"id=" + id +
+						",userId='" + userId + "'" + 
+						",albumId='" + albumId + "'" + 
+						",favoriteTime='" + favoriteTime + "'" + 
+						",favoriteFlag='" + favoriteFlag + "'" + 
+		                '}';
+    }
 	
-	public Long getId(){
-		return this.id;
-	}
-			
-	public void setUserId(Long userId){
-		this.userId = userId;
-	}
-	
-	public Long getUserId(){
-		return this.userId;
-	}
-			
-	public void setAlbumId(Long albumId){
-		this.albumId = albumId;
-	}
-	
-	public Long getAlbumId(){
-		return this.albumId;
-	}
-			
-	public void setFavoriteTime(java.util.Date favoriteTime){
-		this.favoriteTime = favoriteTime;
-	}
-	
-	public java.util.Date getFavoriteTime(){
-		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

@@ -1,82 +1,72 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
- * 对应数据库表(album_music_relate):
+ * 专辑曲谱关联表
  */
-public class AlbumMusicRelate {
+@Data
+@TableName("album_music_relate")
+@ApiModel(value = "AlbumMusicRelate对象", description = "专辑曲谱关联表")
+public class AlbumMusicRelate implements Serializable {
+	private static final long serialVersionUID = 1L;
+    /** 
+    * 主键 
+    */
+    @ApiModelProperty("主键 ")
+    @TableId(value = "id_", type = IdType.UUID)
+    private Long id;
+    /** 
+    * 专辑ID 
+    */
+    @ApiModelProperty("专辑ID ")
+	@TableField(value = "album_id_")
+    private Long albumId;
+    /** 
+    * 曲谱ID 
+    */
+    @ApiModelProperty("曲谱ID ")
+	@TableField(value = "music_sheet_id_")
+    private Long musicSheetId;
+    /** 
+    * 排序号 
+    */
+    @ApiModelProperty("排序号 ")
+	@TableField(value = "sort_number_")
+    private Byte sortNumber;
+    /** 
+    * 添加时间 
+    */
+    @ApiModelProperty("添加时间 ")
+	@TableField(value = "create_time_")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date createTime;
+    /** 
+    * 添加人 
+    */
+    @ApiModelProperty("添加人 ")
+	@TableField(value = "create_by_")
+    private Long createBy;
 
-	@ApiModelProperty(value = "主键",required = false)
-	private Long id;
-	
-	@ApiModelProperty(value = "专辑ID",required = false)
-	private Long albumId;
-	
-	@ApiModelProperty(value = "曲谱ID",required = false)
-	private Long musicSheetId;
-	
-	@ApiModelProperty(value = "排序号",required = false)
-	private Integer sortNumber;
-	
-	@ApiModelProperty(value = "添加时间",required = false)
-	private java.util.Date createTime;
-	
-	@ApiModelProperty(value = "添加人",required = false)
-	private Long createBy;
-	
-	public void setId(Long id){
-		this.id = id;
-	}
+    @Override
+    public String toString() {
+        return "AlbumMusicRelate{" +
+				"id=" + id +
+						",albumId='" + albumId + "'" + 
+						",musicSheetId='" + musicSheetId + "'" + 
+						",sortNumber='" + sortNumber + "'" + 
+						",createTime='" + createTime + "'" + 
+						",createBy='" + createBy + "'" + 
+		                '}';
+    }
 	
-	public Long getId(){
-		return this.id;
-	}
-			
-	public void setAlbumId(Long albumId){
-		this.albumId = albumId;
-	}
-	
-	public Long getAlbumId(){
-		return this.albumId;
-	}
-			
-	public void setMusicSheetId(Long musicSheetId){
-		this.musicSheetId = musicSheetId;
-	}
-	
-	public Long getMusicSheetId(){
-		return this.musicSheetId;
-	}
-			
-	public void setSortNumber(Integer sortNumber){
-		this.sortNumber = sortNumber;
-	}
-	
-	public Integer getSortNumber(){
-		return this.sortNumber;
-	}
-			
-	public void setCreateTime(java.util.Date createTime){
-		this.createTime = createTime;
-	}
-	
-	public java.util.Date getCreateTime(){
-		return this.createTime;
-	}
-			
-	public void setCreateBy(Long createBy){
-		this.createBy = createBy;
-	}
-	
-	public Long getCreateBy(){
-		return this.createBy;
-	}
-			
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
-
-}
+}

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

@@ -1,159 +1,123 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
- * 对应数据库表(music_album):
+ * 专辑表
  */
-public class MusicAlbum {
-
-	@ApiModelProperty(value = "主键",required = false)
-	private Long id;
-	
-	@ApiModelProperty(value = "专辑名称",required = false)
-	private String albumName;
-	
-	@ApiModelProperty(value = "专辑简介",required = false)
-	private String albumDesc;
-	
-	@ApiModelProperty(value = "专辑标签(多个标签以逗号分开)",required = false)
-	private String albumTag;
-	
-	@ApiModelProperty(value = "专辑封面图片URL",required = false)
-	private String albumCoverUrl;
-	
-	@ApiModelProperty(value = "专辑状态(1:启用;0:停用)",required = false)
-	private boolean albumStatus;
-	
-	@ApiModelProperty(value = "排序号",required = false)
-	private Integer sortNumber;
-	
-	@ApiModelProperty(value = "是否热门专辑(1:是;0:否)",required = false)
-	private boolean hotFlag;
-	
-	@ApiModelProperty(value = "是否置顶(1:是;0:否)",required = false)
-	private boolean topFlag;
-	
-	@ApiModelProperty(value = "创建时间",required = false)
-	private java.util.Date createTime;
-	
-	@ApiModelProperty(value = "创建人",required = false)
-	private Long createBy;
-	
-	@ApiModelProperty(value = "更新时间",required = false)
-	private java.util.Date updateTime;
-	
-	@ApiModelProperty(value = "更新人",required = false)
-	private Long updateBy;
-	
-	public void setId(Long id){
-		this.id = id;
-	}
-	
-	public Long getId(){
-		return this.id;
-	}
-			
-	public void setAlbumName(String albumName){
-		this.albumName = albumName;
-	}
-	
-	public String getAlbumName(){
-		return this.albumName;
-	}
-			
-	public void setAlbumDesc(String albumDesc){
-		this.albumDesc = albumDesc;
-	}
-	
-	public String getAlbumDesc(){
-		return this.albumDesc;
-	}
-			
-	public void setAlbumTag(String albumTag){
-		this.albumTag = albumTag;
-	}
-	
-	public String getAlbumTag(){
-		return this.albumTag;
-	}
-			
-	public void setAlbumCoverUrl(String albumCoverUrl){
-		this.albumCoverUrl = albumCoverUrl;
-	}
-	
-	public String getAlbumCoverUrl(){
-		return this.albumCoverUrl;
-	}
-			
-	public void setAlbumStatus(boolean albumStatus){
-		this.albumStatus = albumStatus;
-	}
-	
-	public boolean isAlbumStatus(){
-		return this.albumStatus;
-	}
-			
-	public void setSortNumber(Integer sortNumber){
-		this.sortNumber = sortNumber;
-	}
-	
-	public Integer getSortNumber(){
-		return this.sortNumber;
-	}
-			
-	public void setHotFlag(boolean hotFlag){
-		this.hotFlag = hotFlag;
-	}
-	
-	public boolean isHotFlag(){
-		return this.hotFlag;
-	}
-			
-	public void setTopFlag(boolean topFlag){
-		this.topFlag = topFlag;
-	}
-	
-	public boolean isTopFlag(){
-		return this.topFlag;
-	}
-			
-	public void setCreateTime(java.util.Date createTime){
-		this.createTime = createTime;
-	}
-	
-	public java.util.Date getCreateTime(){
-		return this.createTime;
-	}
-			
-	public void setCreateBy(Long createBy){
-		this.createBy = createBy;
-	}
-	
-	public Long getCreateBy(){
-		return this.createBy;
-	}
-			
-	public void setUpdateTime(java.util.Date updateTime){
-		this.updateTime = updateTime;
-	}
-	
-	public java.util.Date getUpdateTime(){
-		return this.updateTime;
-	}
-			
-	public void setUpdateBy(Long updateBy){
-		this.updateBy = updateBy;
-	}
-	
-	public Long getUpdateBy(){
-		return this.updateBy;
-	}
-			
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
+@Data
+@TableName("music_album")
+@ApiModel(value = "MusicAlbum对象", description = "专辑表")
+public class MusicAlbum implements Serializable {
+	private static final long serialVersionUID = 1L;
+    /** 
+    * 主键 
+    */
+    @ApiModelProperty("主键 ")
+    @TableId(value = "id_", type = IdType.UUID)
+    private Long id;
+    /** 
+    * 专辑名称 
+    */
+    @ApiModelProperty("专辑名称 ")
+	@TableField(value = "album_name_")
+    private String albumName;
+    /** 
+    * 专辑简介 
+    */
+    @ApiModelProperty("专辑简介 ")
+	@TableField(value = "album_desc_")
+    private String albumDesc;
+    /** 
+    * 专辑标签(多个标签以逗号分开) 
+    */
+    @ApiModelProperty("专辑标签(多个标签以逗号分开) ")
+	@TableField(value = "album_tag_")
+    private String albumTag;
+    /** 
+    * 专辑封面图片URL 
+    */
+    @ApiModelProperty("专辑封面图片URL ")
+	@TableField(value = "album_cover_url_")
+    private String albumCoverUrl;
+    /** 
+    * 专辑状态(1:启用;0:停用) 
+    */
+    @ApiModelProperty("专辑状态(1:启用;0:停用) ")
+	@TableField(value = "album_status_")
+    private Byte albumStatus;
+    /** 
+    * 排序号 
+    */
+    @ApiModelProperty("排序号 ")
+	@TableField(value = "sort_number_")
+    private Integer sortNumber;
+    /** 
+    * 是否热门专辑(1:是;0:否) 
+    */
+    @ApiModelProperty("是否热门专辑(1:是;0:否) ")
+	@TableField(value = "hot_flag_")
+    private Byte hotFlag;
+    /** 
+    * 是否置顶(1:是;0:否) 
+    */
+    @ApiModelProperty("是否置顶(1:是;0:否) ")
+	@TableField(value = "top_flag_")
+    private Byte topFlag;
+    /** 
+    * 创建时间 
+    */
+    @ApiModelProperty("创建时间 ")
+	@TableField(value = "create_time_")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date createTime;
+    /** 
+    * 创建人 
+    */
+    @ApiModelProperty("创建人 ")
+	@TableField(value = "create_by_")
+    private Long createBy;
+    /** 
+    * 更新时间 
+    */
+    @ApiModelProperty("更新时间 ")
+	@TableField(value = "update_time_")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date updateTime;
+    /** 
+    * 更新人 
+    */
+    @ApiModelProperty("更新人 ")
+	@TableField(value = "update_by_")
+    private Long updateBy;
 
-}
+    @Override
+    public String toString() {
+        return "MusicAlbum{" +
+				"id=" + id +
+						",albumName='" + albumName + "'" + 
+						",albumDesc='" + albumDesc + "'" + 
+						",albumTag='" + albumTag + "'" + 
+						",albumCoverUrl='" + albumCoverUrl + "'" + 
+						",albumStatus='" + albumStatus + "'" + 
+						",sortNumber='" + sortNumber + "'" + 
+						",hotFlag='" + hotFlag + "'" + 
+						",topFlag='" + topFlag + "'" + 
+						",createTime='" + createTime + "'" + 
+						",createBy='" + createBy + "'" + 
+						",updateTime='" + updateTime + "'" + 
+						",updateBy='" + updateBy + "'" + 
+		                '}';
+    }
+	
+}

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

@@ -1,71 +1,65 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
- * 对应数据库表(music_favorite):
+ * 乐谱收藏表
  */
-public class MusicFavorite {
+@Data
+@TableName("music_favorite")
+@ApiModel(value = "MusicFavorite对象", description = "乐谱收藏表")
+public class MusicFavorite implements Serializable {
+	private static final long serialVersionUID = 1L;
+    /** 
+    * 主键 
+    */
+    @ApiModelProperty("主键 ")
+    @TableId(value = "id_", type = IdType.UUID)
+    private Long id;
+    /** 
+    * 用户ID(目前只是学生ID) 
+    */
+    @ApiModelProperty("用户ID(目前只是学生ID) ")
+	@TableField(value = "user_id_")
+    private Long userId;
+    /** 
+    * 曲谱ID 
+    */
+    @ApiModelProperty("曲谱ID ")
+	@TableField(value = "music_sheet_id_")
+    private Long musicSheetId;
+    /** 
+    * 收藏时间 
+    */
+    @ApiModelProperty("收藏时间 ")
+	@TableField(value = "favorite_time_")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date favoriteTime;
+    /** 
+    * 是否收藏(1:收藏;0:取消收藏) 
+    */
+    @ApiModelProperty("是否收藏(1:收藏;0:取消收藏) ")
+	@TableField(value = "favorite_flag_")
+    private Byte favoriteFlag;
 
-	@ApiModelProperty(value = "主键",required = false)
-	private Long id;
-	
-	@ApiModelProperty(value = "用户ID(目前只是学生ID)",required = false)
-	private Long userId;
-	
-	@ApiModelProperty(value = "曲谱ID",required = false)
-	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;
-	}
+    @Override
+    public String toString() {
+        return "MusicFavorite{" +
+				"id=" + id +
+						",userId='" + userId + "'" + 
+						",musicSheetId='" + musicSheetId + "'" + 
+						",favoriteTime='" + favoriteTime + "'" + 
+						",favoriteFlag='" + favoriteFlag + "'" + 
+		                '}';
+    }
 	
-	public Long getId(){
-		return this.id;
-	}
-			
-	public void setUserId(Long userId){
-		this.userId = userId;
-	}
-	
-	public Long getUserId(){
-		return this.userId;
-	}
-			
-	public void setMusicSheetId(Long musicSheetId){
-		this.musicSheetId = musicSheetId;
-	}
-	
-	public Long getMusicSheetId(){
-		return this.musicSheetId;
-	}
-			
-	public void setFavoriteTime(java.util.Date favoriteTime){
-		this.favoriteTime = favoriteTime;
-	}
-	
-	public java.util.Date getFavoriteTime(){
-		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

@@ -1,280 +1,201 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.math.BigDecimal;
 
 /**
- * 对应数据库表(music_sheet):
+ * 曲谱表
  */
-public class MusicSheet {
-
-	@ApiModelProperty(value = "主键",required = false)
-	private Long id;
-	
-	@ApiModelProperty(value = "曲谱名称",required = false)
-	private String musicSheetName;
-	
-	@ApiModelProperty(value = "曲谱来源(0:平台;非0:老师ID)",required = false)
-	private Long userId;
-	
-	@ApiModelProperty(value = "作曲人",required = false)
-	private String composer;
-	
-	@ApiModelProperty(value = "曲谱声部(适用的乐器,可能是多个,用逗号分隔)",required = false)
-	private String musicSubject;
-	
-	@ApiModelProperty(value = "曲谱音频文件类型(midi;mp3)",required = false)
-	private String audioType;
-	
-	@ApiModelProperty(value = "曲谱标签(多个标签用逗号分隔)",required = false)
-	private String musicTag;
-	
-	@ApiModelProperty(value = "默认播放速度",required = false)
-	private Integer playSpeed;
-	
-	@ApiModelProperty(value = "是否可以评测(0:否;1:是)",required = false)
-	private boolean canEvaluate;
-	
-	@ApiModelProperty(value = "是否展示指法(0:否;1:是)",required = false)
-	private boolean showFingering;
-	
-	@ApiModelProperty(value = "收费类型(0:免费;1:会员;2:单曲收费)",required = false)
-	private boolean chargeType;
-	
-	@ApiModelProperty(value = "审核状态",required = false)
-	private boolean auditStatus;
-	
-	@ApiModelProperty(value = "排序号",required = false)
-	private Integer sortNumber;
-	
-	@ApiModelProperty(value = "是否置顶(0:否;1:是)",required = false)
-	private boolean topFlag;
-	
-	@ApiModelProperty(value = "是否热门曲谱(0:否;1:是)",required = false)
-	private boolean hotFlag;
-	
-	@ApiModelProperty(value = "曲谱价格",required = false)
-	private java.math.BigDecimal musicPrice;
-	
-	@ApiModelProperty(value = "音频文件存储路径",required = false)
-	private String audioFileUrl;
-	
-	@ApiModelProperty(value = "XML文件存储路径",required = false)
-	private String xmlFileUrl;
-	
-	@ApiModelProperty(value = "是否自带节拍器(0:否;1:是)",required = false)
-	private boolean hasBeat;
-	
-	@ApiModelProperty(value = "创建时间",required = false)
-	private java.util.Date createTime;
-	
-	@ApiModelProperty(value = "创建人(老师或者是后台平台用户)",required = false)
-	private Long createBy;
-	
-	@ApiModelProperty(value = "更新时间",required = false)
-	private java.util.Date updateTime;
-	
-	@ApiModelProperty(value = "更新人(老师或者是后台平台用户)",required = false)
-	private Long updateBy;
-	
-	@ApiModelProperty(value = "备注",required = false)
-	private String remark;
-	
-	public void setId(Long id){
-		this.id = id;
-	}
-	
-	public Long getId(){
-		return this.id;
-	}
-			
-	public void setMusicSheetName(String musicSheetName){
-		this.musicSheetName = musicSheetName;
-	}
-	
-	public String getMusicSheetName(){
-		return this.musicSheetName;
-	}
-			
-	public void setUserId(Long userId){
-		this.userId = userId;
-	}
-	
-	public Long getUserId(){
-		return this.userId;
-	}
-			
-	public void setComposer(String composer){
-		this.composer = composer;
-	}
-	
-	public String getComposer(){
-		return this.composer;
-	}
-			
-	public void setMusicSubject(String musicSubject){
-		this.musicSubject = musicSubject;
-	}
-	
-	public String getMusicSubject(){
-		return this.musicSubject;
-	}
-			
-	public void setAudioType(String audioType){
-		this.audioType = audioType;
-	}
-	
-	public String getAudioType(){
-		return this.audioType;
-	}
-			
-	public void setMusicTag(String musicTag){
-		this.musicTag = musicTag;
-	}
-	
-	public String getMusicTag(){
-		return this.musicTag;
-	}
-			
-	public void setPlaySpeed(Integer playSpeed){
-		this.playSpeed = playSpeed;
-	}
-	
-	public Integer getPlaySpeed(){
-		return this.playSpeed;
-	}
-			
-	public void setCanEvaluate(boolean canEvaluate){
-		this.canEvaluate = canEvaluate;
-	}
-	
-	public boolean isCanEvaluate(){
-		return this.canEvaluate;
-	}
-			
-	public void setShowFingering(boolean showFingering){
-		this.showFingering = showFingering;
-	}
-	
-	public boolean isShowFingering(){
-		return this.showFingering;
-	}
-			
-	public void setChargeType(boolean chargeType){
-		this.chargeType = chargeType;
-	}
-	
-	public boolean isChargeType(){
-		return this.chargeType;
-	}
-			
-	public void setAuditStatus(boolean auditStatus){
-		this.auditStatus = auditStatus;
-	}
-	
-	public boolean isAuditStatus(){
-		return this.auditStatus;
-	}
-			
-	public void setSortNumber(Integer sortNumber){
-		this.sortNumber = sortNumber;
-	}
-	
-	public Integer getSortNumber(){
-		return this.sortNumber;
-	}
-			
-	public void setTopFlag(boolean topFlag){
-		this.topFlag = topFlag;
-	}
-	
-	public boolean isTopFlag(){
-		return this.topFlag;
-	}
-			
-	public void setHotFlag(boolean hotFlag){
-		this.hotFlag = hotFlag;
-	}
-	
-	public boolean isHotFlag(){
-		return this.hotFlag;
-	}
-			
-	public void setMusicPrice(java.math.BigDecimal musicPrice){
-		this.musicPrice = musicPrice;
-	}
-	
-	public java.math.BigDecimal getMusicPrice(){
-		return this.musicPrice;
-	}
-			
-	public void setAudioFileUrl(String audioFileUrl){
-		this.audioFileUrl = audioFileUrl;
-	}
-	
-	public String getAudioFileUrl(){
-		return this.audioFileUrl;
-	}
-			
-	public void setXmlFileUrl(String xmlFileUrl){
-		this.xmlFileUrl = xmlFileUrl;
-	}
-	
-	public String getXmlFileUrl(){
-		return this.xmlFileUrl;
-	}
-			
-	public void setHasBeat(boolean hasBeat){
-		this.hasBeat = hasBeat;
-	}
-	
-	public boolean isHasBeat(){
-		return this.hasBeat;
-	}
-			
-	public void setCreateTime(java.util.Date createTime){
-		this.createTime = createTime;
-	}
-	
-	public java.util.Date getCreateTime(){
-		return this.createTime;
-	}
-			
-	public void setCreateBy(Long createBy){
-		this.createBy = createBy;
-	}
-	
-	public Long getCreateBy(){
-		return this.createBy;
-	}
-			
-	public void setUpdateTime(java.util.Date updateTime){
-		this.updateTime = updateTime;
-	}
-	
-	public java.util.Date getUpdateTime(){
-		return this.updateTime;
-	}
-			
-	public void setUpdateBy(Long updateBy){
-		this.updateBy = updateBy;
-	}
-	
-	public Long getUpdateBy(){
-		return this.updateBy;
-	}
-			
-	public void setRemark(String remark){
-		this.remark = remark;
-	}
-	
-	public String getRemark(){
-		return this.remark;
-	}
-			
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
+@Data
+@TableName("music_sheet")
+@ApiModel(value = "MusicSheet对象", description = "曲谱表")
+public class MusicSheet implements Serializable {
+	private static final long serialVersionUID = 1L;
+    /** 
+    * 主键 
+    */
+    @ApiModelProperty("主键 ")
+    @TableId(value = "id_", type = IdType.UUID)
+    private Long id;
+    /** 
+    * 曲谱名称 
+    */
+    @ApiModelProperty("曲谱名称 ")
+	@TableField(value = "music_sheet_name_")
+    private String musicSheetName;
+    /** 
+    * 曲谱来源(0:平台;非0:老师ID) 
+    */
+    @ApiModelProperty("曲谱来源(0:平台;非0:老师ID) ")
+	@TableField(value = "user_id_")
+    private Long userId;
+    /** 
+    * 作曲人 
+    */
+    @ApiModelProperty("作曲人 ")
+	@TableField(value = "composer_")
+    private String composer;
+    /** 
+    * 曲谱声部(适用的乐器,可能是多个,用逗号分隔) 
+    */
+    @ApiModelProperty("曲谱声部(适用的乐器,可能是多个,用逗号分隔) ")
+	@TableField(value = "music_subject_")
+    private String musicSubject;
+    /** 
+    * 曲谱音频文件类型(midi;mp3) 
+    */
+    @ApiModelProperty("曲谱音频文件类型(midi;mp3) ")
+	@TableField(value = "audio_type_")
+    private String audioType;
+    /** 
+    * 曲谱标签(多个标签用逗号分隔) 
+    */
+    @ApiModelProperty("曲谱标签(多个标签用逗号分隔) ")
+	@TableField(value = "music_tag_")
+    private String musicTag;
+    /** 
+    * 默认播放速度 
+    */
+    @ApiModelProperty("默认播放速度 ")
+	@TableField(value = "play_speed_")
+    private Integer playSpeed;
+    /** 
+    * 是否可以评测(0:否;1:是) 
+    */
+    @ApiModelProperty("是否可以评测(0:否;1:是) ")
+	@TableField(value = "can_evaluate_")
+    private Byte canEvaluate;
+    /** 
+    * 是否展示指法(0:否;1:是) 
+    */
+    @ApiModelProperty("是否展示指法(0:否;1:是) ")
+	@TableField(value = "show_fingering_")
+    private Byte showFingering;
+    /** 
+    * 收费类型(0:免费;1:会员;2:单曲收费) 
+    */
+    @ApiModelProperty("收费类型(0:免费;1:会员;2:单曲收费) ")
+	@TableField(value = "charge_type_")
+    private Byte chargeType;
+    /** 
+    * 审核状态 
+    */
+    @ApiModelProperty("审核状态 ")
+	@TableField(value = "audit_status_")
+    private Byte auditStatus;
+    /** 
+    * 排序号 
+    */
+    @ApiModelProperty("排序号 ")
+	@TableField(value = "sort_number_")
+    private Integer sortNumber;
+    /** 
+    * 是否置顶(0:否;1:是) 
+    */
+    @ApiModelProperty("是否置顶(0:否;1:是) ")
+	@TableField(value = "top_flag_")
+    private Byte topFlag;
+    /** 
+    * 是否热门曲谱(0:否;1:是) 
+    */
+    @ApiModelProperty("是否热门曲谱(0:否;1:是) ")
+	@TableField(value = "hot_flag_")
+    private Byte hotFlag;
+    /** 
+    * 曲谱价格 
+    */
+    @ApiModelProperty("曲谱价格 ")
+	@TableField(value = "music_price_")
+    private BigDecimal musicPrice;
+    /** 
+    * 音频文件存储路径 
+    */
+    @ApiModelProperty("音频文件存储路径 ")
+	@TableField(value = "audio_file_url_")
+    private String audioFileUrl;
+    /** 
+    * XML文件存储路径 
+    */
+    @ApiModelProperty("XML文件存储路径 ")
+	@TableField(value = "xml_file_url_")
+    private String xmlFileUrl;
+    /** 
+    * 是否自带节拍器(0:否;1:是) 
+    */
+    @ApiModelProperty("是否自带节拍器(0:否;1:是) ")
+	@TableField(value = "has_beat_")
+    private Byte hasBeat;
+    /** 
+    * 创建时间 
+    */
+    @ApiModelProperty("创建时间 ")
+	@TableField(value = "create_time_")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date createTime;
+    /** 
+    * 创建人(老师或者是后台平台用户) 
+    */
+    @ApiModelProperty("创建人(老师或者是后台平台用户) ")
+	@TableField(value = "create_by_")
+    private Long createBy;
+    /** 
+    * 更新时间 
+    */
+    @ApiModelProperty("更新时间 ")
+	@TableField(value = "update_time_")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date updateTime;
+    /** 
+    * 更新人(老师或者是后台平台用户) 
+    */
+    @ApiModelProperty("更新人(老师或者是后台平台用户) ")
+	@TableField(value = "update_by_")
+    private Long updateBy;
+    /** 
+    * 备注 
+    */
+    @ApiModelProperty("备注 ")
+	@TableField(value = "remark_")
+    private String remark;
 
-}
+    @Override
+    public String toString() {
+        return "MusicSheet{" +
+				"id=" + id +
+						",musicSheetName='" + musicSheetName + "'" + 
+						",userId='" + userId + "'" + 
+						",composer='" + composer + "'" + 
+						",musicSubject='" + musicSubject + "'" + 
+						",audioType='" + audioType + "'" + 
+						",musicTag='" + musicTag + "'" + 
+						",playSpeed='" + playSpeed + "'" + 
+						",canEvaluate='" + canEvaluate + "'" + 
+						",showFingering='" + showFingering + "'" + 
+						",chargeType='" + chargeType + "'" + 
+						",auditStatus='" + auditStatus + "'" + 
+						",sortNumber='" + sortNumber + "'" + 
+						",topFlag='" + topFlag + "'" + 
+						",hotFlag='" + hotFlag + "'" + 
+						",musicPrice='" + musicPrice + "'" + 
+						",audioFileUrl='" + audioFileUrl + "'" + 
+						",xmlFileUrl='" + xmlFileUrl + "'" + 
+						",hasBeat='" + hasBeat + "'" + 
+						",createTime='" + createTime + "'" + 
+						",createBy='" + createBy + "'" + 
+						",updateTime='" + updateTime + "'" + 
+						",updateBy='" + updateBy + "'" + 
+						",remark='" + remark + "'" + 
+		                '}';
+    }
+	
+}

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

@@ -1,93 +1,79 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
- * 对应数据库表(music_sheet_accompaniment):
+ * 曲谱伴奏表
  */
-public class MusicSheetAccompaniment {
+@Data
+@TableName("music_sheet_accompaniment")
+@ApiModel(value = "MusicSheetAccompaniment对象", description = "曲谱伴奏表")
+public class MusicSheetAccompaniment implements Serializable {
+	private static final long serialVersionUID = 1L;
+    /** 
+    * 主键 
+    */
+    @ApiModelProperty("主键 ")
+    @TableId(value = "id_", type = IdType.UUID)
+    private Long id;
+    /** 
+    * 曲谱ID 
+    */
+    @ApiModelProperty("曲谱ID ")
+	@TableField(value = "music_sheet_id_")
+    private Long musicSheetId;
+    /** 
+    * 声部 
+    */
+    @ApiModelProperty("声部 ")
+	@TableField(value = "music_subject_")
+    private String musicSubject;
+    /** 
+    * MP3原声音频文件URL 
+    */
+    @ApiModelProperty("MP3原声音频文件URL ")
+	@TableField(value = "audio_file_url_")
+    private String audioFileUrl;
+    /** 
+    * 排序号 
+    */
+    @ApiModelProperty("排序号 ")
+	@TableField(value = "sort_number_")
+    private Byte sortNumber;
+    /** 
+    * 创建时间 
+    */
+    @ApiModelProperty("创建时间 ")
+	@TableField(value = "create_time_")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date createTime;
+    /** 
+    * 创建人(老师或者是后台平台用户) 
+    */
+    @ApiModelProperty("创建人(老师或者是后台平台用户) ")
+	@TableField(value = "create_by_")
+    private Long createBy;
 
-	@ApiModelProperty(value = "主键",required = false)
-	private Long id;
-	
-	@ApiModelProperty(value = "曲谱ID",required = false)
-	private Long musicSheetId;
-	
-	@ApiModelProperty(value = "声部",required = false)
-	private String musicSubject;
-	
-	@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 createBy;
-	
-	public void setId(Long id){
-		this.id = id;
-	}
+    @Override
+    public String toString() {
+        return "MusicSheetAccompaniment{" +
+				"id=" + id +
+						",musicSheetId='" + musicSheetId + "'" + 
+						",musicSubject='" + musicSubject + "'" + 
+						",audioFileUrl='" + audioFileUrl + "'" + 
+						",sortNumber='" + sortNumber + "'" + 
+						",createTime='" + createTime + "'" + 
+						",createBy='" + createBy + "'" + 
+		                '}';
+    }
 	
-	public Long getId(){
-		return this.id;
-	}
-			
-	public void setMusicSheetId(Long musicSheetId){
-		this.musicSheetId = musicSheetId;
-	}
-	
-	public Long getMusicSheetId(){
-		return this.musicSheetId;
-	}
-			
-	public void setMusicSubject(String musicSubject){
-		this.musicSubject = musicSubject;
-	}
-	
-	public String getMusicSubject(){
-		return this.musicSubject;
-	}
-			
-	public void setAudioFileUrl(String audioFileUrl){
-		this.audioFileUrl = audioFileUrl;
-	}
-	
-	public String getAudioFileUrl(){
-		return this.audioFileUrl;
-	}
-			
-	public void setSortNumber(Integer sortNumber){
-		this.sortNumber = sortNumber;
-	}
-	
-	public Integer getSortNumber(){
-		return this.sortNumber;
-	}
-			
-	public void setCreateTime(java.util.Date createTime){
-		this.createTime = createTime;
-	}
-	
-	public java.util.Date getCreateTime(){
-		return this.createTime;
-	}
-			
-	public void setCreateBy(Long createBy){
-		this.createBy = createBy;
-	}
-	
-	public Long getCreateBy(){
-		return this.createBy;
-	}
-			
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
-
-}
+}

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

@@ -1,104 +1,87 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.math.BigDecimal;
 
 /**
- * 对应数据库表(music_sheet_purchase_record):
+ * 曲谱购买记录表
  */
-public class MusicSheetPurchaseRecord {
-
-	@ApiModelProperty(value = "主键",required = false)
-	private Long id;
-	
-	@ApiModelProperty(value = "曲谱ID",required = false)
-	private Long musicSheetId;
-	
-	@ApiModelProperty(value = "老师ID",required = false)
-	private Long teacherId;
-	
-	@ApiModelProperty(value = "订单流水号",required = false)
-	private String orderNo;
-	
-	@ApiModelProperty(value = "学生ID",required = false)
-	private Long studentId;
-	
-	@ApiModelProperty(value = "购买时间",required = false)
-	private java.util.Date purchaseTime;
-	
-	@ApiModelProperty(value = "购买价格",required = false)
-	private java.math.BigDecimal purchasePrice;
-	
-	@ApiModelProperty(value = "订单状态(1:已完成;0:取消)",required = false)
-	private boolean orderStatus;
-	
-	public void setId(Long id){
-		this.id = id;
-	}
-	
-	public Long getId(){
-		return this.id;
-	}
-			
-	public void setMusicSheetId(Long musicSheetId){
-		this.musicSheetId = musicSheetId;
-	}
-	
-	public Long getMusicSheetId(){
-		return this.musicSheetId;
-	}
-			
-	public void setTeacherId(Long teacherId){
-		this.teacherId = teacherId;
-	}
-	
-	public Long getTeacherId(){
-		return this.teacherId;
-	}
-			
-	public void setOrderNo(String orderNo){
-		this.orderNo = orderNo;
-	}
-	
-	public String getOrderNo(){
-		return this.orderNo;
-	}
-			
-	public void setStudentId(Long studentId){
-		this.studentId = studentId;
-	}
-	
-	public Long getStudentId(){
-		return this.studentId;
-	}
-			
-	public void setPurchaseTime(java.util.Date purchaseTime){
-		this.purchaseTime = purchaseTime;
-	}
-	
-	public java.util.Date getPurchaseTime(){
-		return this.purchaseTime;
-	}
-			
-	public void setPurchasePrice(java.math.BigDecimal purchasePrice){
-		this.purchasePrice = purchasePrice;
-	}
-	
-	public java.math.BigDecimal getPurchasePrice(){
-		return this.purchasePrice;
-	}
-			
-	public void setOrderStatus(boolean orderStatus){
-		this.orderStatus = orderStatus;
-	}
-	
-	public boolean isOrderStatus(){
-		return this.orderStatus;
-	}
-			
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
+@Data
+@TableName("music_sheet_purchase_record")
+@ApiModel(value = "MusicSheetPurchaseRecord对象", description = "曲谱购买记录表")
+public class MusicSheetPurchaseRecord implements Serializable {
+	private static final long serialVersionUID = 1L;
+    /** 
+    * 主键 
+    */
+    @ApiModelProperty("主键 ")
+    @TableId(value = "id_", type = IdType.UUID)
+    private Long id;
+    /** 
+    * 曲谱ID 
+    */
+    @ApiModelProperty("曲谱ID ")
+	@TableField(value = "music_sheet_id_")
+    private Long musicSheetId;
+    /** 
+    * 老师ID 
+    */
+    @ApiModelProperty("老师ID ")
+	@TableField(value = "teacher_id_")
+    private Long teacherId;
+    /** 
+    * 订单流水号 
+    */
+    @ApiModelProperty("订单流水号 ")
+	@TableField(value = "order_no_")
+    private String orderNo;
+    /** 
+    * 学生ID 
+    */
+    @ApiModelProperty("学生ID ")
+	@TableField(value = "student_id_")
+    private Long studentId;
+    /** 
+    * 购买时间 
+    */
+    @ApiModelProperty("购买时间 ")
+	@TableField(value = "purchase_time_")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date purchaseTime;
+    /** 
+    * 购买价格 
+    */
+    @ApiModelProperty("购买价格 ")
+	@TableField(value = "purchase_price_")
+    private BigDecimal purchasePrice;
+    /** 
+    * 订单状态(1:已完成;0:取消) 
+    */
+    @ApiModelProperty("订单状态(1:已完成;0:取消) ")
+	@TableField(value = "order_status_")
+    private Byte orderStatus;
 
-}
+    @Override
+    public String toString() {
+        return "MusicSheetPurchaseRecord{" +
+				"id=" + id +
+						",musicSheetId='" + musicSheetId + "'" + 
+						",teacherId='" + teacherId + "'" + 
+						",orderNo='" + orderNo + "'" + 
+						",studentId='" + studentId + "'" + 
+						",purchaseTime='" + purchaseTime + "'" + 
+						",purchasePrice='" + purchasePrice + "'" + 
+						",orderStatus='" + orderStatus + "'" + 
+		                '}';
+    }
+	
+}

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

@@ -1,71 +1,65 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
- * 对应数据库表(video_lesson_evaluate):
+ * 视频课学员评价
  */
-public class VideoLessonEvaluate {
+@Data
+@TableName("video_lesson_evaluate")
+@ApiModel(value = "VideoLessonEvaluate对象", description = "视频课学员评价")
+public class VideoLessonEvaluate implements Serializable {
+	private static final long serialVersionUID = 1L;
+    /** 
+    * 主键 
+    */
+    @ApiModelProperty("主键 ")
+    @TableId(value = "id_", type = IdType.UUID)
+    private Long id;
+    /** 
+    * 视频ID 
+    */
+    @ApiModelProperty("视频ID ")
+	@TableField(value = "video_id_")
+    private Long videoId;
+    /** 
+    * 学生ID 
+    */
+    @ApiModelProperty("学生ID ")
+	@TableField(value = "student_id_")
+    private Long studentId;
+    /** 
+    * 评价内容 
+    */
+    @ApiModelProperty("评价内容 ")
+	@TableField(value = "content_")
+    private String content;
+    /** 
+    * 评价时间 
+    */
+    @ApiModelProperty("评价时间 ")
+	@TableField(value = "evaluate_time_")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date evaluateTime;
 
-	@ApiModelProperty(value = "主键",required = false)
-	private Long id;
-	
-	@ApiModelProperty(value = "视频ID",required = false)
-	private Long videoId;
-	
-	@ApiModelProperty(value = "学生ID",required = false)
-	private Long studentId;
-	
-	@ApiModelProperty(value = "评价内容",required = false)
-	private String content;
-	
-	@ApiModelProperty(value = "评价时间",required = false)
-	private java.util.Date evaluateTime;
-	
-	public void setId(Long id){
-		this.id = id;
-	}
+    @Override
+    public String toString() {
+        return "VideoLessonEvaluate{" +
+				"id=" + id +
+						",videoId='" + videoId + "'" + 
+						",studentId='" + studentId + "'" + 
+						",content='" + content + "'" + 
+						",evaluateTime='" + evaluateTime + "'" + 
+		                '}';
+    }
 	
-	public Long getId(){
-		return this.id;
-	}
-			
-	public void setVideoId(Long videoId){
-		this.videoId = videoId;
-	}
-	
-	public Long getVideoId(){
-		return this.videoId;
-	}
-			
-	public void setStudentId(Long studentId){
-		this.studentId = studentId;
-	}
-	
-	public Long getStudentId(){
-		return this.studentId;
-	}
-			
-	public void setContent(String content){
-		this.content = content;
-	}
-	
-	public String getContent(){
-		return this.content;
-	}
-			
-	public void setEvaluateTime(java.util.Date evaluateTime){
-		this.evaluateTime = evaluateTime;
-	}
-	
-	public java.util.Date getEvaluateTime(){
-		return this.evaluateTime;
-	}
-			
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
-
-}
+}

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

@@ -1,181 +1,137 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
- * 对应数据库表(video_lesson_group):
+ * 视频课基本信息表
  */
-public class VideoLessonGroup {
-
-	@ApiModelProperty(value = "主键",required = false)
-	private Long id;
-	
-	@ApiModelProperty(value = "课程名称",required = false)
-	private String lessonName;
-	
-	@ApiModelProperty(value = "课程声部",required = false)
-	private String lessonSubject;
-	
-	@ApiModelProperty(value = "课程介绍",required = false)
-	private String lessonDesc;
-	
-	@ApiModelProperty(value = "课程价格",required = false)
-	private Integer lessonPrice;
-	
-	@ApiModelProperty(value = "课程封面图片URL",required = false)
-	private String lessonCoverUrl;
-	
-	@ApiModelProperty(value = "老师ID",required = false)
-	private Long teacherId;
-	
-	@ApiModelProperty(value = "课程节数",required = false)
-	private Integer lessonCount;
-	
-	@ApiModelProperty(value = "排序号",required = false)
-	private Integer sortNumber;
-	
-	@ApiModelProperty(value = "课程标签",required = false)
-	private String lessonTag;
-	
-	@ApiModelProperty(value = "是否置顶",required = false)
-	private boolean topFlag;
-	
-	@ApiModelProperty(value = "是否热门课程",required = false)
-	private boolean hotFlag;
-	
-	@ApiModelProperty(value = "审核状态",required = false)
-	private boolean auditStatus;
-	
-	@ApiModelProperty(value = "创建时间",required = false)
-	private java.util.Date createTime;
-	
-	@ApiModelProperty(value = "更新时间",required = false)
-	private java.util.Date updateTime;
-	
-	public void setId(Long id){
-		this.id = id;
-	}
-	
-	public Long getId(){
-		return this.id;
-	}
-			
-	public void setLessonName(String lessonName){
-		this.lessonName = lessonName;
-	}
-	
-	public String getLessonName(){
-		return this.lessonName;
-	}
-			
-	public void setLessonSubject(String lessonSubject){
-		this.lessonSubject = lessonSubject;
-	}
-	
-	public String getLessonSubject(){
-		return this.lessonSubject;
-	}
-			
-	public void setLessonDesc(String lessonDesc){
-		this.lessonDesc = lessonDesc;
-	}
-	
-	public String getLessonDesc(){
-		return this.lessonDesc;
-	}
-			
-	public void setLessonPrice(Integer lessonPrice){
-		this.lessonPrice = lessonPrice;
-	}
-	
-	public Integer getLessonPrice(){
-		return this.lessonPrice;
-	}
-			
-	public void setLessonCoverUrl(String lessonCoverUrl){
-		this.lessonCoverUrl = lessonCoverUrl;
-	}
-	
-	public String getLessonCoverUrl(){
-		return this.lessonCoverUrl;
-	}
-			
-	public void setTeacherId(Long teacherId){
-		this.teacherId = teacherId;
-	}
-	
-	public Long getTeacherId(){
-		return this.teacherId;
-	}
-			
-	public void setLessonCount(Integer lessonCount){
-		this.lessonCount = lessonCount;
-	}
-	
-	public Integer getLessonCount(){
-		return this.lessonCount;
-	}
-			
-	public void setSortNumber(Integer sortNumber){
-		this.sortNumber = sortNumber;
-	}
-	
-	public Integer getSortNumber(){
-		return this.sortNumber;
-	}
-			
-	public void setLessonTag(String lessonTag){
-		this.lessonTag = lessonTag;
-	}
-	
-	public String getLessonTag(){
-		return this.lessonTag;
-	}
-			
-	public void setTopFlag(boolean topFlag){
-		this.topFlag = topFlag;
-	}
-	
-	public boolean isTopFlag(){
-		return this.topFlag;
-	}
-			
-	public void setHotFlag(boolean hotFlag){
-		this.hotFlag = hotFlag;
-	}
-	
-	public boolean isHotFlag(){
-		return this.hotFlag;
-	}
-			
-	public void setAuditStatus(boolean auditStatus){
-		this.auditStatus = auditStatus;
-	}
-	
-	public boolean isAuditStatus(){
-		return this.auditStatus;
-	}
-			
-	public void setCreateTime(java.util.Date createTime){
-		this.createTime = createTime;
-	}
-	
-	public java.util.Date getCreateTime(){
-		return this.createTime;
-	}
-			
-	public void setUpdateTime(java.util.Date updateTime){
-		this.updateTime = updateTime;
-	}
-	
-	public java.util.Date getUpdateTime(){
-		return this.updateTime;
-	}
-			
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
+@Data
+@TableName("video_lesson_group")
+@ApiModel(value = "VideoLessonGroup对象", description = "视频课基本信息表")
+public class VideoLessonGroup implements Serializable {
+	private static final long serialVersionUID = 1L;
+    /** 
+    * 主键 
+    */
+    @ApiModelProperty("主键 ")
+    @TableId(value = "id_", type = IdType.UUID)
+    private Long id;
+    /** 
+    * 课程名称 
+    */
+    @ApiModelProperty("课程名称 ")
+	@TableField(value = "lesson_name_")
+    private String lessonName;
+    /** 
+    * 课程声部 
+    */
+    @ApiModelProperty("课程声部 ")
+	@TableField(value = "lesson_subject_")
+    private String lessonSubject;
+    /** 
+    * 课程介绍 
+    */
+    @ApiModelProperty("课程介绍 ")
+	@TableField(value = "lesson_desc_")
+    private String lessonDesc;
+    /** 
+    * 课程价格 
+    */
+    @ApiModelProperty("课程价格 ")
+	@TableField(value = "lesson_price_")
+    private Integer lessonPrice;
+    /** 
+    * 课程封面图片URL 
+    */
+    @ApiModelProperty("课程封面图片URL ")
+	@TableField(value = "lesson_cover_url_")
+    private String lessonCoverUrl;
+    /** 
+    * 老师ID 
+    */
+    @ApiModelProperty("老师ID ")
+	@TableField(value = "teacher_id_")
+    private Long teacherId;
+    /** 
+    * 课程节数 
+    */
+    @ApiModelProperty("课程节数 ")
+	@TableField(value = "lesson_count_")
+    private Integer lessonCount;
+    /** 
+    * 排序号 
+    */
+    @ApiModelProperty("排序号 ")
+	@TableField(value = "sort_number_")
+    private Integer sortNumber;
+    /** 
+    * 课程标签 
+    */
+    @ApiModelProperty("课程标签 ")
+	@TableField(value = "lesson_tag_")
+    private String lessonTag;
+    /** 
+    * 是否置顶 
+    */
+    @ApiModelProperty("是否置顶 ")
+	@TableField(value = "top_flag_")
+    private Byte topFlag;
+    /** 
+    * 是否热门课程 
+    */
+    @ApiModelProperty("是否热门课程 ")
+	@TableField(value = "hot_flag_")
+    private Byte hotFlag;
+    /** 
+    * 审核状态 
+    */
+    @ApiModelProperty("审核状态 ")
+	@TableField(value = "audit_status_")
+    private Byte auditStatus;
+    /** 
+    * 创建时间 
+    */
+    @ApiModelProperty("创建时间 ")
+	@TableField(value = "create_time_")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date createTime;
+    /** 
+    * 更新时间 
+    */
+    @ApiModelProperty("更新时间 ")
+	@TableField(value = "update_time_")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date updateTime;
 
-}
+    @Override
+    public String toString() {
+        return "VideoLessonGroup{" +
+				"id=" + id +
+						",lessonName='" + lessonName + "'" + 
+						",lessonSubject='" + lessonSubject + "'" + 
+						",lessonDesc='" + lessonDesc + "'" + 
+						",lessonPrice='" + lessonPrice + "'" + 
+						",lessonCoverUrl='" + lessonCoverUrl + "'" + 
+						",teacherId='" + teacherId + "'" + 
+						",lessonCount='" + lessonCount + "'" + 
+						",sortNumber='" + sortNumber + "'" + 
+						",lessonTag='" + lessonTag + "'" + 
+						",topFlag='" + topFlag + "'" + 
+						",hotFlag='" + hotFlag + "'" + 
+						",auditStatus='" + auditStatus + "'" + 
+						",createTime='" + createTime + "'" + 
+						",updateTime='" + updateTime + "'" + 
+		                '}';
+    }
+	
+}

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

@@ -1,148 +1,116 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
- * 对应数据库表(video_lesson_group_detail):
+ * 视频课明细表
  */
-public class VideoLessonGroupDetail {
-
-	@ApiModelProperty(value = "主键",required = false)
-	private Long id;
-	
-	@ApiModelProperty(value = "课程组ID",required = false)
-	private Long videoLessonGroupId;
-	
-	@ApiModelProperty(value = "视频标题",required = false)
-	private String videoTitle;
-	
-	@ApiModelProperty(value = "视频内容",required = false)
-	private String videoContent;
-	
-	@ApiModelProperty(value = "视频文件URL",required = false)
-	private String videoUrl;
-	
-	@ApiModelProperty(value = "视频封面图片URL",required = false)
-	private String coverUrl;
-	
-	@ApiModelProperty(value = "是否收费(1:收费;0:免费)",required = false)
-	private boolean chargeFlag;
-	
-	@ApiModelProperty(value = "排序号",required = false)
-	private Integer sortNumber;
-	
-	@ApiModelProperty(value = "创建人(老师ID)",required = false)
-	private Long teacherId;
-	
-	@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;
-	
-	public void setId(Long id){
-		this.id = id;
-	}
-	
-	public Long getId(){
-		return this.id;
-	}
-			
-	public void setVideoLessonGroupId(Long videoLessonGroupId){
-		this.videoLessonGroupId = videoLessonGroupId;
-	}
-	
-	public Long getVideoLessonGroupId(){
-		return this.videoLessonGroupId;
-	}
-			
-	public void setVideoTitle(String videoTitle){
-		this.videoTitle = videoTitle;
-	}
-	
-	public String getVideoTitle(){
-		return this.videoTitle;
-	}
-			
-	public void setVideoContent(String videoContent){
-		this.videoContent = videoContent;
-	}
-	
-	public String getVideoContent(){
-		return this.videoContent;
-	}
-			
-	public void setVideoUrl(String videoUrl){
-		this.videoUrl = videoUrl;
-	}
-	
-	public String getVideoUrl(){
-		return this.videoUrl;
-	}
-			
-	public void setCoverUrl(String coverUrl){
-		this.coverUrl = coverUrl;
-	}
-	
-	public String getCoverUrl(){
-		return this.coverUrl;
-	}
-			
-	public void setChargeFlag(boolean chargeFlag){
-		this.chargeFlag = chargeFlag;
-	}
-	
-	public boolean isChargeFlag(){
-		return this.chargeFlag;
-	}
-			
-	public void setSortNumber(Integer sortNumber){
-		this.sortNumber = sortNumber;
-	}
-	
-	public Integer getSortNumber(){
-		return this.sortNumber;
-	}
-			
-	public void setTeacherId(Long teacherId){
-		this.teacherId = teacherId;
-	}
-	
-	public Long getTeacherId(){
-		return this.teacherId;
-	}
-			
-	public void setCreateTime(java.util.Date createTime){
-		this.createTime = createTime;
-	}
-	
-	public java.util.Date getCreateTime(){
-		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;
-	}
-	
-	public java.util.Date getUpdateTime(){
-		return this.updateTime;
-	}
-			
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
+@Data
+@TableName("video_lesson_group_detail")
+@ApiModel(value = "VideoLessonGroupDetail对象", description = "视频课明细表")
+public class VideoLessonGroupDetail implements Serializable {
+	private static final long serialVersionUID = 1L;
+    /** 
+    * 主键 
+    */
+    @ApiModelProperty("主键 ")
+    @TableId(value = "id_", type = IdType.UUID)
+    private Long id;
+    /** 
+    * 课程组ID 
+    */
+    @ApiModelProperty("课程组ID ")
+	@TableField(value = "video_lesson_group_id_")
+    private Long videoLessonGroupId;
+    /** 
+    * 视频标题 
+    */
+    @ApiModelProperty("视频标题 ")
+	@TableField(value = "video_title_")
+    private String videoTitle;
+    /** 
+    * 视频内容 
+    */
+    @ApiModelProperty("视频内容 ")
+	@TableField(value = "video_content_")
+    private String videoContent;
+    /** 
+    * 视频文件URL 
+    */
+    @ApiModelProperty("视频文件URL ")
+	@TableField(value = "video_url_")
+    private String videoUrl;
+    /** 
+    * 视频封面图片URL 
+    */
+    @ApiModelProperty("视频封面图片URL ")
+	@TableField(value = "cover_url_")
+    private String coverUrl;
+    /** 
+    * 是否收费(1:收费;0:免费) 
+    */
+    @ApiModelProperty("是否收费(1:收费;0:免费) ")
+	@TableField(value = "charge_flag_")
+    private Byte chargeFlag;
+    /** 
+    * 排序号 
+    */
+    @ApiModelProperty("排序号 ")
+	@TableField(value = "sort_number_")
+    private Integer sortNumber;
+    /** 
+    * 创建人(老师ID) 
+    */
+    @ApiModelProperty("创建人(老师ID) ")
+	@TableField(value = "teacher_id_")
+    private Long teacherId;
+    /** 
+    * 创建时间 
+    */
+    @ApiModelProperty("创建时间 ")
+	@TableField(value = "create_time_")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date createTime;
+    /** 
+    * 更新人 
+    */
+    @ApiModelProperty("更新人 ")
+	@TableField(value = "update_by_")
+    private Long updateBy;
+    /** 
+    * 更新时间 
+    */
+    @ApiModelProperty("更新时间 ")
+	@TableField(value = "update_time_")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date updateTime;
 
-}
+    @Override
+    public String toString() {
+        return "VideoLessonGroupDetail{" +
+				"id=" + id +
+						",videoLessonGroupId='" + videoLessonGroupId + "'" + 
+						",videoTitle='" + videoTitle + "'" + 
+						",videoContent='" + videoContent + "'" + 
+						",videoUrl='" + videoUrl + "'" + 
+						",coverUrl='" + coverUrl + "'" + 
+						",chargeFlag='" + chargeFlag + "'" + 
+						",sortNumber='" + sortNumber + "'" + 
+						",teacherId='" + teacherId + "'" + 
+						",createTime='" + createTime + "'" + 
+						",updateBy='" + updateBy + "'" + 
+						",updateTime='" + updateTime + "'" + 
+		                '}';
+    }
+	
+}

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

@@ -1,93 +1,80 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.math.BigDecimal;
 
 /**
- * 对应数据库表(video_lesson_purchase_record):
+ * 视频课购买记录表
  */
-public class VideoLessonPurchaseRecord {
+@Data
+@TableName("video_lesson_purchase_record")
+@ApiModel(value = "VideoLessonPurchaseRecord对象", description = "视频课购买记录表")
+public class VideoLessonPurchaseRecord implements Serializable {
+	private static final long serialVersionUID = 1L;
+    /** 
+    * 主键 
+    */
+    @ApiModelProperty("主键 ")
+    @TableId(value = "id_", type = IdType.UUID)
+    private Long id;
+    /** 
+    * 视频课组ID 
+    */
+    @ApiModelProperty("视频课组ID ")
+	@TableField(value = "video_lesson_group_id_")
+    private Long videoLessonGroupId;
+    /** 
+    * 学生ID 
+    */
+    @ApiModelProperty("学生ID ")
+	@TableField(value = "student_id_")
+    private Long studentId;
+    /** 
+    * 购买时间 
+    */
+    @ApiModelProperty("购买时间 ")
+	@TableField(value = "purchase_time_")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date purchaseTime;
+    /** 
+    * 支付金额 
+    */
+    @ApiModelProperty("支付金额 ")
+	@TableField(value = "pay_money_")
+    private BigDecimal payMoney;
+    /** 
+    * 订单流水号 
+    */
+    @ApiModelProperty("订单流水号 ")
+	@TableField(value = "order_no_")
+    private String orderNo;
+    /** 
+    * 订单状态(1:已完成;0:取消) 
+    */
+    @ApiModelProperty("订单状态(1:已完成;0:取消) ")
+	@TableField(value = "order_status_")
+    private Byte orderStatus;
 
-	@ApiModelProperty(value = "主键",required = false)
-	private Long id;
-	
-	@ApiModelProperty(value = "视频课组ID",required = false)
-	private Long videoLessonGroupId;
-	
-	@ApiModelProperty(value = "学生ID",required = false)
-	private Long studentId;
-	
-	@ApiModelProperty(value = "购买时间",required = false)
-	private java.util.Date purchaseTime;
-	
-	@ApiModelProperty(value = "支付金额",required = false)
-	private java.math.BigDecimal payMoney;
-	
-	@ApiModelProperty(value = "订单流水号",required = false)
-	private String orderNo;
-	
-	@ApiModelProperty(value = "订单状态(1:已完成;0:取消)",required = false)
-	private boolean orderStatus;
-	
-	public void setId(Long id){
-		this.id = id;
-	}
+    @Override
+    public String toString() {
+        return "VideoLessonPurchaseRecord{" +
+				"id=" + id +
+						",videoLessonGroupId='" + videoLessonGroupId + "'" + 
+						",studentId='" + studentId + "'" + 
+						",purchaseTime='" + purchaseTime + "'" + 
+						",payMoney='" + payMoney + "'" + 
+						",orderNo='" + orderNo + "'" + 
+						",orderStatus='" + orderStatus + "'" + 
+		                '}';
+    }
 	
-	public Long getId(){
-		return this.id;
-	}
-			
-	public void setVideoLessonGroupId(Long videoLessonGroupId){
-		this.videoLessonGroupId = videoLessonGroupId;
-	}
-	
-	public Long getVideoLessonGroupId(){
-		return this.videoLessonGroupId;
-	}
-			
-	public void setStudentId(Long studentId){
-		this.studentId = studentId;
-	}
-	
-	public Long getStudentId(){
-		return this.studentId;
-	}
-			
-	public void setPurchaseTime(java.util.Date purchaseTime){
-		this.purchaseTime = purchaseTime;
-	}
-	
-	public java.util.Date getPurchaseTime(){
-		return this.purchaseTime;
-	}
-			
-	public void setPayMoney(java.math.BigDecimal payMoney){
-		this.payMoney = payMoney;
-	}
-	
-	public java.math.BigDecimal getPayMoney(){
-		return this.payMoney;
-	}
-			
-	public void setOrderNo(String orderNo){
-		this.orderNo = orderNo;
-	}
-	
-	public String getOrderNo(){
-		return this.orderNo;
-	}
-			
-	public void setOrderStatus(boolean orderStatus){
-		this.orderStatus = orderStatus;
-	}
-	
-	public boolean isOrderStatus(){
-		return this.orderStatus;
-	}
-			
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
-
-}
+}

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

@@ -1,93 +1,81 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
- * 对应数据库表(video_lesson_study_record):
+ * 视频课学习记录表
  */
-public class VideoLessonStudyRecord {
+@Data
+@TableName("video_lesson_study_record")
+@ApiModel(value = "VideoLessonStudyRecord对象", description = "视频课学习记录表")
+public class VideoLessonStudyRecord implements Serializable {
+	private static final long serialVersionUID = 1L;
+    /** 
+    * 主键 
+    */
+    @ApiModelProperty("主键 ")
+    @TableId(value = "id_", type = IdType.UUID)
+    private Long id;
+    /** 
+    * 视频课组ID 
+    */
+    @ApiModelProperty("视频课组ID ")
+	@TableField(value = "video_lesson_group_id_")
+    private Long videoLessonGroupId;
+    /** 
+    * 视频ID 
+    */
+    @ApiModelProperty("视频ID ")
+	@TableField(value = "video_id_")
+    private Long videoId;
+    /** 
+    * 学生ID 
+    */
+    @ApiModelProperty("学生ID ")
+	@TableField(value = "student_id_")
+    private Long studentId;
+    /** 
+    * 是否学完(1:是;0:否) 
+    */
+    @ApiModelProperty("是否学完(1:是;0:否) ")
+	@TableField(value = "finish_flag_")
+    private Byte finishFlag;
+    /** 
+    * 学习开始时间 
+    */
+    @ApiModelProperty("学习开始时间 ")
+	@TableField(value = "start_time_")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date startTime;
+    /** 
+    * 学习完成时间 
+    */
+    @ApiModelProperty("学习完成时间 ")
+	@TableField(value = "finish_time_")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date finishTime;
 
-	@ApiModelProperty(value = "主键",required = false)
-	private Long id;
-	
-	@ApiModelProperty(value = "视频课组ID",required = false)
-	private Long videoLessonGroupId;
-	
-	@ApiModelProperty(value = "视频ID",required = false)
-	private Long videoId;
-	
-	@ApiModelProperty(value = "学生ID",required = false)
-	private Long studentId;
-	
-	@ApiModelProperty(value = "是否学完(1:是;0:否)",required = false)
-	private boolean finishFlag;
-	
-	@ApiModelProperty(value = "学习开始时间",required = false)
-	private java.util.Date startTime;
-	
-	@ApiModelProperty(value = "学习完成时间",required = false)
-	private java.util.Date finishTime;
-	
-	public void setId(Long id){
-		this.id = id;
-	}
+    @Override
+    public String toString() {
+        return "VideoLessonStudyRecord{" +
+				"id=" + id +
+						",videoLessonGroupId='" + videoLessonGroupId + "'" + 
+						",videoId='" + videoId + "'" + 
+						",studentId='" + studentId + "'" + 
+						",finishFlag='" + finishFlag + "'" + 
+						",startTime='" + startTime + "'" + 
+						",finishTime='" + finishTime + "'" + 
+		                '}';
+    }
 	
-	public Long getId(){
-		return this.id;
-	}
-			
-	public void setVideoLessonGroupId(Long videoLessonGroupId){
-		this.videoLessonGroupId = videoLessonGroupId;
-	}
-	
-	public Long getVideoLessonGroupId(){
-		return this.videoLessonGroupId;
-	}
-			
-	public void setVideoId(Long videoId){
-		this.videoId = videoId;
-	}
-	
-	public Long getVideoId(){
-		return this.videoId;
-	}
-			
-	public void setStudentId(Long studentId){
-		this.studentId = studentId;
-	}
-	
-	public Long getStudentId(){
-		return this.studentId;
-	}
-			
-	public void setFinishFlag(boolean finishFlag){
-		this.finishFlag = finishFlag;
-	}
-	
-	public boolean isFinishFlag(){
-		return this.finishFlag;
-	}
-			
-	public void setStartTime(java.util.Date startTime){
-		this.startTime = startTime;
-	}
-	
-	public java.util.Date getStartTime(){
-		return this.startTime;
-	}
-			
-	public void setFinishTime(java.util.Date finishTime){
-		this.finishTime = finishTime;
-	}
-	
-	public java.util.Date getFinishTime(){
-		return this.finishTime;
-	}
-			
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
-
-}
+}

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

@@ -1,8 +1,21 @@
 package com.yonge.cooleshow.biz.dal.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.yonge.cooleshow.biz.dal.entity.AlbumFavorite;
-import com.yonge.cooleshow.common.service.BaseService;
 
-public interface AlbumFavoriteService extends BaseService<Long, AlbumFavorite> {
+/**
+ * 专辑收藏表 服务类
+ * @author yzp
+ * @date 2022-03-18
+ */
+public interface AlbumFavoriteService extends IService<AlbumFavorite>  {
 
+
+    /**
+     * 自定义分页
+     * @author yzp
+ 	 * @date 2022-03-18
+     */
+    IPage<AlbumFavorite> selectPage(IPage<AlbumFavorite> page, AlbumFavorite albumFavorite);
 }

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

@@ -1,8 +1,21 @@
 package com.yonge.cooleshow.biz.dal.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.yonge.cooleshow.biz.dal.entity.AlbumMusicRelate;
-import com.yonge.cooleshow.common.service.BaseService;
 
-public interface AlbumMusicRelateService extends BaseService<Long, AlbumMusicRelate> {
+/**
+ * 专辑曲谱关联表 服务类
+ * @author yzp
+ * @date 2022-03-18
+ */
+public interface AlbumMusicRelateService extends IService<AlbumMusicRelate>  {
 
+
+    /**
+     * 自定义分页
+     * @author yzp
+ 	 * @date 2022-03-18
+     */
+    IPage<AlbumMusicRelate> selectPage(IPage<AlbumMusicRelate> page, AlbumMusicRelate albumMusicRelate);
 }

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

@@ -1,8 +1,21 @@
 package com.yonge.cooleshow.biz.dal.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.yonge.cooleshow.biz.dal.entity.MusicAlbum;
-import com.yonge.cooleshow.common.service.BaseService;
 
-public interface MusicAlbumService extends BaseService<Long, MusicAlbum> {
+/**
+ * 专辑表 服务类
+ * @author yzp
+ * @date 2022-03-18
+ */
+public interface MusicAlbumService extends IService<MusicAlbum>  {
 
+
+    /**
+     * 自定义分页
+     * @author yzp
+ 	 * @date 2022-03-18
+     */
+    IPage<MusicAlbum> selectPage(IPage<MusicAlbum> page, MusicAlbum musicAlbum);
 }

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

@@ -1,8 +1,21 @@
 package com.yonge.cooleshow.biz.dal.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.yonge.cooleshow.biz.dal.entity.MusicFavorite;
-import com.yonge.cooleshow.common.service.BaseService;
 
-public interface MusicFavoriteService extends BaseService<Long, MusicFavorite> {
+/**
+ * 乐谱收藏表 服务类
+ * @author yzp
+ * @date 2022-03-18
+ */
+public interface MusicFavoriteService extends IService<MusicFavorite>  {
 
+
+    /**
+     * 自定义分页
+     * @author yzp
+ 	 * @date 2022-03-18
+     */
+    IPage<MusicFavorite> selectPage(IPage<MusicFavorite> page, MusicFavorite musicFavorite);
 }

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

@@ -1,8 +1,21 @@
 package com.yonge.cooleshow.biz.dal.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.yonge.cooleshow.biz.dal.entity.MusicSheetAccompaniment;
-import com.yonge.cooleshow.common.service.BaseService;
 
-public interface MusicSheetAccompanimentService extends BaseService<Long, MusicSheetAccompaniment> {
+/**
+ * 曲谱伴奏表 服务类
+ * @author yzp
+ * @date 2022-03-18
+ */
+public interface MusicSheetAccompanimentService extends IService<MusicSheetAccompaniment>  {
 
+
+    /**
+     * 自定义分页
+     * @author yzp
+ 	 * @date 2022-03-18
+     */
+    IPage<MusicSheetAccompaniment> selectPage(IPage<MusicSheetAccompaniment> page, MusicSheetAccompaniment musicSheetAccompaniment);
 }

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

@@ -1,8 +1,21 @@
 package com.yonge.cooleshow.biz.dal.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.yonge.cooleshow.biz.dal.entity.MusicSheetPurchaseRecord;
-import com.yonge.cooleshow.common.service.BaseService;
 
-public interface MusicSheetPurchaseRecordService extends BaseService<Long, MusicSheetPurchaseRecord> {
+/**
+ * 曲谱购买记录表 服务类
+ * @author yzp
+ * @date 2022-03-18
+ */
+public interface MusicSheetPurchaseRecordService extends IService<MusicSheetPurchaseRecord>  {
 
+
+    /**
+     * 自定义分页
+     * @author yzp
+ 	 * @date 2022-03-18
+     */
+    IPage<MusicSheetPurchaseRecord> selectPage(IPage<MusicSheetPurchaseRecord> page, MusicSheetPurchaseRecord musicSheetPurchaseRecord);
 }

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

@@ -1,8 +1,21 @@
 package com.yonge.cooleshow.biz.dal.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
-import com.yonge.cooleshow.common.service.BaseService;
 
-public interface MusicSheetService extends BaseService<Long, MusicSheet> {
+/**
+ * 曲谱表 服务类
+ * @author yzp
+ * @date 2022-03-18
+ */
+public interface MusicSheetService extends IService<MusicSheet>  {
 
+
+    /**
+     * 自定义分页
+     * @author yzp
+ 	 * @date 2022-03-18
+     */
+    IPage<MusicSheet> selectPage(IPage<MusicSheet> page, MusicSheet musicSheet);
 }

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

@@ -18,4 +18,7 @@ public interface TeacherService extends IService<Teacher>  {
  	 * @date 2022-03-18
      */
     IPage<Teacher> selectPage(IPage<Teacher> page, Teacher teacher);
+
+    Teacher detail1(Integer userId);
+
 }

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

@@ -1,8 +1,21 @@
 package com.yonge.cooleshow.biz.dal.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.yonge.cooleshow.biz.dal.entity.VideoLessonEvaluate;
-import com.yonge.cooleshow.common.service.BaseService;
 
-public interface VideoLessonEvaluateService extends BaseService<Long, VideoLessonEvaluate> {
+/**
+ * 视频课学员评价 服务类
+ * @author yzp
+ * @date 2022-03-18
+ */
+public interface VideoLessonEvaluateService extends IService<VideoLessonEvaluate>  {
 
+
+    /**
+     * 自定义分页
+     * @author yzp
+ 	 * @date 2022-03-18
+     */
+    IPage<VideoLessonEvaluate> selectPage(IPage<VideoLessonEvaluate> page, VideoLessonEvaluate videoLessonEvaluate);
 }

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

@@ -1,8 +1,21 @@
 package com.yonge.cooleshow.biz.dal.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.yonge.cooleshow.biz.dal.entity.VideoLessonGroupDetail;
-import com.yonge.cooleshow.common.service.BaseService;
 
-public interface VideoLessonGroupDetailService extends BaseService<Long, VideoLessonGroupDetail> {
+/**
+ * 视频课明细表 服务类
+ * @author yzp
+ * @date 2022-03-18
+ */
+public interface VideoLessonGroupDetailService extends IService<VideoLessonGroupDetail>  {
 
+
+    /**
+     * 自定义分页
+     * @author yzp
+ 	 * @date 2022-03-18
+     */
+    IPage<VideoLessonGroupDetail> selectPage(IPage<VideoLessonGroupDetail> page, VideoLessonGroupDetail videoLessonGroupDetail);
 }

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

@@ -1,8 +1,21 @@
 package com.yonge.cooleshow.biz.dal.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.yonge.cooleshow.biz.dal.entity.VideoLessonGroup;
-import com.yonge.cooleshow.common.service.BaseService;
 
-public interface VideoLessonGroupService extends BaseService<Long, VideoLessonGroup> {
+/**
+ * 视频课基本信息表 服务类
+ * @author yzp
+ * @date 2022-03-18
+ */
+public interface VideoLessonGroupService extends IService<VideoLessonGroup>  {
 
+
+    /**
+     * 自定义分页
+     * @author yzp
+ 	 * @date 2022-03-18
+     */
+    IPage<VideoLessonGroup> selectPage(IPage<VideoLessonGroup> page, VideoLessonGroup videoLessonGroup);
 }

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

@@ -1,8 +1,21 @@
 package com.yonge.cooleshow.biz.dal.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.yonge.cooleshow.biz.dal.entity.VideoLessonPurchaseRecord;
-import com.yonge.cooleshow.common.service.BaseService;
 
-public interface VideoLessonPurchaseRecordService extends BaseService<Long, VideoLessonPurchaseRecord> {
+/**
+ * 视频课购买记录表 服务类
+ * @author yzp
+ * @date 2022-03-18
+ */
+public interface VideoLessonPurchaseRecordService extends IService<VideoLessonPurchaseRecord>  {
 
+
+    /**
+     * 自定义分页
+     * @author yzp
+ 	 * @date 2022-03-18
+     */
+    IPage<VideoLessonPurchaseRecord> selectPage(IPage<VideoLessonPurchaseRecord> page, VideoLessonPurchaseRecord videoLessonPurchaseRecord);
 }

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

@@ -1,8 +1,21 @@
 package com.yonge.cooleshow.biz.dal.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.yonge.cooleshow.biz.dal.entity.VideoLessonStudyRecord;
-import com.yonge.cooleshow.common.service.BaseService;
 
-public interface VideoLessonStudyRecordService extends BaseService<Long, VideoLessonStudyRecord> {
+/**
+ * 视频课学习记录表 服务类
+ * @author yzp
+ * @date 2022-03-18
+ */
+public interface VideoLessonStudyRecordService extends IService<VideoLessonStudyRecord>  {
 
+
+    /**
+     * 自定义分页
+     * @author yzp
+ 	 * @date 2022-03-18
+     */
+    IPage<VideoLessonStudyRecord> selectPage(IPage<VideoLessonStudyRecord> page, VideoLessonStudyRecord videoLessonStudyRecord);
 }

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

@@ -1,23 +1,22 @@
 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 com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 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;
+import com.yonge.cooleshow.biz.dal.service.AlbumFavoriteService;
+
 
 @Service
-public class AlbumFavoriteServiceImpl extends BaseServiceImpl<Long, AlbumFavorite>  implements AlbumFavoriteService {
-	
-	@Autowired
-	private AlbumFavoriteDao albumFavoriteDao;
+public class AlbumFavoriteServiceImpl extends ServiceImpl<AlbumFavoriteDao, AlbumFavorite> implements AlbumFavoriteService {
 
-	@Override
-	public BaseDAO<Long, AlbumFavorite> getDAO() {
-		return albumFavoriteDao;
-	}
+    /**
+     * 分页查询
+     */
+     @Override
+    public IPage<AlbumFavorite> selectPage(IPage<AlbumFavorite> page, AlbumFavorite albumFavorite){
+        return page.setRecords(baseMapper.selectPage(page, albumFavorite));
+    }
 	
 }

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

@@ -1,23 +1,22 @@
 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 com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
-
 import com.yonge.cooleshow.biz.dal.entity.AlbumMusicRelate;
-import com.yonge.cooleshow.biz.dal.service.AlbumMusicRelateService;
 import com.yonge.cooleshow.biz.dal.dao.AlbumMusicRelateDao;
+import com.yonge.cooleshow.biz.dal.service.AlbumMusicRelateService;
+
 
 @Service
-public class AlbumMusicRelateServiceImpl extends BaseServiceImpl<Long, AlbumMusicRelate>  implements AlbumMusicRelateService {
-	
-	@Autowired
-	private AlbumMusicRelateDao albumMusicRelateDao;
+public class AlbumMusicRelateServiceImpl extends ServiceImpl<AlbumMusicRelateDao, AlbumMusicRelate> implements AlbumMusicRelateService {
 
-	@Override
-	public BaseDAO<Long, AlbumMusicRelate> getDAO() {
-		return albumMusicRelateDao;
-	}
+    /**
+     * 分页查询
+     */
+     @Override
+    public IPage<AlbumMusicRelate> selectPage(IPage<AlbumMusicRelate> page, AlbumMusicRelate albumMusicRelate){
+        return page.setRecords(baseMapper.selectPage(page, albumMusicRelate));
+    }
 	
 }

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

@@ -1,23 +1,22 @@
 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 com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
-
 import com.yonge.cooleshow.biz.dal.entity.MusicAlbum;
-import com.yonge.cooleshow.biz.dal.service.MusicAlbumService;
 import com.yonge.cooleshow.biz.dal.dao.MusicAlbumDao;
+import com.yonge.cooleshow.biz.dal.service.MusicAlbumService;
+
 
 @Service
-public class MusicAlbumServiceImpl extends BaseServiceImpl<Long, MusicAlbum>  implements MusicAlbumService {
-	
-	@Autowired
-	private MusicAlbumDao musicAlbumDao;
+public class MusicAlbumServiceImpl extends ServiceImpl<MusicAlbumDao, MusicAlbum> implements MusicAlbumService {
 
-	@Override
-	public BaseDAO<Long, MusicAlbum> getDAO() {
-		return musicAlbumDao;
-	}
+    /**
+     * 分页查询
+     */
+     @Override
+    public IPage<MusicAlbum> selectPage(IPage<MusicAlbum> page, MusicAlbum musicAlbum){
+        return page.setRecords(baseMapper.selectPage(page, musicAlbum));
+    }
 	
 }

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

@@ -1,23 +1,22 @@
 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 com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 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;
+import com.yonge.cooleshow.biz.dal.service.MusicFavoriteService;
+
 
 @Service
-public class MusicFavoriteServiceImpl extends BaseServiceImpl<Long, MusicFavorite>  implements MusicFavoriteService {
-	
-	@Autowired
-	private MusicFavoriteDao musicFavoriteDao;
+public class MusicFavoriteServiceImpl extends ServiceImpl<MusicFavoriteDao, MusicFavorite> implements MusicFavoriteService {
 
-	@Override
-	public BaseDAO<Long, MusicFavorite> getDAO() {
-		return musicFavoriteDao;
-	}
+    /**
+     * 分页查询
+     */
+     @Override
+    public IPage<MusicFavorite> selectPage(IPage<MusicFavorite> page, MusicFavorite musicFavorite){
+        return page.setRecords(baseMapper.selectPage(page, musicFavorite));
+    }
 	
 }

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

@@ -1,23 +1,22 @@
 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 com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
-
 import com.yonge.cooleshow.biz.dal.entity.MusicSheetAccompaniment;
-import com.yonge.cooleshow.biz.dal.service.MusicSheetAccompanimentService;
 import com.yonge.cooleshow.biz.dal.dao.MusicSheetAccompanimentDao;
+import com.yonge.cooleshow.biz.dal.service.MusicSheetAccompanimentService;
+
 
 @Service
-public class MusicSheetAccompanimentServiceImpl extends BaseServiceImpl<Long, MusicSheetAccompaniment>  implements MusicSheetAccompanimentService {
-	
-	@Autowired
-	private MusicSheetAccompanimentDao musicSheetAccompanimentDao;
+public class MusicSheetAccompanimentServiceImpl extends ServiceImpl<MusicSheetAccompanimentDao, MusicSheetAccompaniment> implements MusicSheetAccompanimentService {
 
-	@Override
-	public BaseDAO<Long, MusicSheetAccompaniment> getDAO() {
-		return musicSheetAccompanimentDao;
-	}
+    /**
+     * 分页查询
+     */
+     @Override
+    public IPage<MusicSheetAccompaniment> selectPage(IPage<MusicSheetAccompaniment> page, MusicSheetAccompaniment musicSheetAccompaniment){
+        return page.setRecords(baseMapper.selectPage(page, musicSheetAccompaniment));
+    }
 	
 }

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

@@ -1,23 +1,22 @@
 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 com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
-
 import com.yonge.cooleshow.biz.dal.entity.MusicSheetPurchaseRecord;
-import com.yonge.cooleshow.biz.dal.service.MusicSheetPurchaseRecordService;
 import com.yonge.cooleshow.biz.dal.dao.MusicSheetPurchaseRecordDao;
+import com.yonge.cooleshow.biz.dal.service.MusicSheetPurchaseRecordService;
+
 
 @Service
-public class MusicSheetPurchaseRecordServiceImpl extends BaseServiceImpl<Long, MusicSheetPurchaseRecord>  implements MusicSheetPurchaseRecordService {
-	
-	@Autowired
-	private MusicSheetPurchaseRecordDao musicSheetPurchaseRecordDao;
+public class MusicSheetPurchaseRecordServiceImpl extends ServiceImpl<MusicSheetPurchaseRecordDao, MusicSheetPurchaseRecord> implements MusicSheetPurchaseRecordService {
 
-	@Override
-	public BaseDAO<Long, MusicSheetPurchaseRecord> getDAO() {
-		return musicSheetPurchaseRecordDao;
-	}
+    /**
+     * 分页查询
+     */
+     @Override
+    public IPage<MusicSheetPurchaseRecord> selectPage(IPage<MusicSheetPurchaseRecord> page, MusicSheetPurchaseRecord musicSheetPurchaseRecord){
+        return page.setRecords(baseMapper.selectPage(page, musicSheetPurchaseRecord));
+    }
 	
 }

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

@@ -1,23 +1,22 @@
 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 com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
-
 import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
-import com.yonge.cooleshow.biz.dal.service.MusicSheetService;
 import com.yonge.cooleshow.biz.dal.dao.MusicSheetDao;
+import com.yonge.cooleshow.biz.dal.service.MusicSheetService;
+
 
 @Service
-public class MusicSheetServiceImpl extends BaseServiceImpl<Long, MusicSheet>  implements MusicSheetService {
-	
-	@Autowired
-	private MusicSheetDao musicSheetDao;
+public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet> implements MusicSheetService {
 
-	@Override
-	public BaseDAO<Long, MusicSheet> getDAO() {
-		return musicSheetDao;
-	}
+    /**
+     * 分页查询
+     */
+     @Override
+    public IPage<MusicSheet> selectPage(IPage<MusicSheet> page, MusicSheet musicSheet){
+        return page.setRecords(baseMapper.selectPage(page, musicSheet));
+    }
 	
 }

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

@@ -2,15 +2,22 @@ package com.yonge.cooleshow.biz.dal.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yonge.cooleshow.biz.dal.dao.SubjectDao;
+import com.yonge.cooleshow.biz.dal.entity.Subject;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.yonge.cooleshow.biz.dal.entity.Teacher;
 import com.yonge.cooleshow.biz.dal.dao.TeacherDao;
 import com.yonge.cooleshow.biz.dal.service.TeacherService;
 
+import java.util.Arrays;
+import java.util.List;
+
 
 @Service
 public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> implements TeacherService {
-
+    @Autowired
+    private SubjectDao subjectDao;
     /**
      * 分页查询
      */
@@ -18,5 +25,11 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
     public IPage<Teacher> selectPage(IPage<Teacher> page, Teacher teacher){
         return page.setRecords(baseMapper.selectPage(page, teacher));
     }
-	
+
+    @Override
+    public Teacher detail1(Integer userId) {
+        List<Subject> bySubjectIds = subjectDao.findBySubjectIds(Arrays.asList(1));
+        return baseMapper.detail1(userId);
+    }
+
 }

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

@@ -1,23 +1,22 @@
 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 com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
-
 import com.yonge.cooleshow.biz.dal.entity.VideoLessonEvaluate;
-import com.yonge.cooleshow.biz.dal.service.VideoLessonEvaluateService;
 import com.yonge.cooleshow.biz.dal.dao.VideoLessonEvaluateDao;
+import com.yonge.cooleshow.biz.dal.service.VideoLessonEvaluateService;
+
 
 @Service
-public class VideoLessonEvaluateServiceImpl extends BaseServiceImpl<Long, VideoLessonEvaluate>  implements VideoLessonEvaluateService {
-	
-	@Autowired
-	private VideoLessonEvaluateDao videoLessonEvaluateDao;
+public class VideoLessonEvaluateServiceImpl extends ServiceImpl<VideoLessonEvaluateDao, VideoLessonEvaluate> implements VideoLessonEvaluateService {
 
-	@Override
-	public BaseDAO<Long, VideoLessonEvaluate> getDAO() {
-		return videoLessonEvaluateDao;
-	}
+    /**
+     * 分页查询
+     */
+     @Override
+    public IPage<VideoLessonEvaluate> selectPage(IPage<VideoLessonEvaluate> page, VideoLessonEvaluate videoLessonEvaluate){
+        return page.setRecords(baseMapper.selectPage(page, videoLessonEvaluate));
+    }
 	
 }

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

@@ -1,23 +1,22 @@
 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 com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 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;
+import com.yonge.cooleshow.biz.dal.service.VideoLessonGroupDetailService;
+
 
 @Service
-public class VideoLessonGroupDetailServiceImpl extends BaseServiceImpl<Long, VideoLessonGroupDetail>  implements VideoLessonGroupDetailService {
-	
-	@Autowired
-	private VideoLessonGroupDetailDao videoLessonGroupDetailDao;
+public class VideoLessonGroupDetailServiceImpl extends ServiceImpl<VideoLessonGroupDetailDao, VideoLessonGroupDetail> implements VideoLessonGroupDetailService {
 
-	@Override
-	public BaseDAO<Long, VideoLessonGroupDetail> getDAO() {
-		return videoLessonGroupDetailDao;
-	}
+    /**
+     * 分页查询
+     */
+     @Override
+    public IPage<VideoLessonGroupDetail> selectPage(IPage<VideoLessonGroupDetail> page, VideoLessonGroupDetail videoLessonGroupDetail){
+        return page.setRecords(baseMapper.selectPage(page, videoLessonGroupDetail));
+    }
 	
 }

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

@@ -1,23 +1,22 @@
 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 com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 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;
+import com.yonge.cooleshow.biz.dal.service.VideoLessonGroupService;
+
 
 @Service
-public class VideoLessonGroupServiceImpl extends BaseServiceImpl<Long, VideoLessonGroup>  implements VideoLessonGroupService {
-	
-	@Autowired
-	private VideoLessonGroupDao videoLessonGroupDao;
+public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao, VideoLessonGroup> implements VideoLessonGroupService {
 
-	@Override
-	public BaseDAO<Long, VideoLessonGroup> getDAO() {
-		return videoLessonGroupDao;
-	}
+    /**
+     * 分页查询
+     */
+     @Override
+    public IPage<VideoLessonGroup> selectPage(IPage<VideoLessonGroup> page, VideoLessonGroup videoLessonGroup){
+        return page.setRecords(baseMapper.selectPage(page, videoLessonGroup));
+    }
 	
 }

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

@@ -1,23 +1,22 @@
 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 com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
-
 import com.yonge.cooleshow.biz.dal.entity.VideoLessonPurchaseRecord;
-import com.yonge.cooleshow.biz.dal.service.VideoLessonPurchaseRecordService;
 import com.yonge.cooleshow.biz.dal.dao.VideoLessonPurchaseRecordDao;
+import com.yonge.cooleshow.biz.dal.service.VideoLessonPurchaseRecordService;
+
 
 @Service
-public class VideoLessonPurchaseRecordServiceImpl extends BaseServiceImpl<Long, VideoLessonPurchaseRecord>  implements VideoLessonPurchaseRecordService {
-	
-	@Autowired
-	private VideoLessonPurchaseRecordDao videoLessonPurchaseRecordDao;
+public class VideoLessonPurchaseRecordServiceImpl extends ServiceImpl<VideoLessonPurchaseRecordDao, VideoLessonPurchaseRecord> implements VideoLessonPurchaseRecordService {
 
-	@Override
-	public BaseDAO<Long, VideoLessonPurchaseRecord> getDAO() {
-		return videoLessonPurchaseRecordDao;
-	}
+    /**
+     * 分页查询
+     */
+     @Override
+    public IPage<VideoLessonPurchaseRecord> selectPage(IPage<VideoLessonPurchaseRecord> page, VideoLessonPurchaseRecord videoLessonPurchaseRecord){
+        return page.setRecords(baseMapper.selectPage(page, videoLessonPurchaseRecord));
+    }
 	
 }

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

@@ -1,23 +1,22 @@
 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 com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
-
 import com.yonge.cooleshow.biz.dal.entity.VideoLessonStudyRecord;
-import com.yonge.cooleshow.biz.dal.service.VideoLessonStudyRecordService;
 import com.yonge.cooleshow.biz.dal.dao.VideoLessonStudyRecordDao;
+import com.yonge.cooleshow.biz.dal.service.VideoLessonStudyRecordService;
+
 
 @Service
-public class VideoLessonStudyRecordServiceImpl extends BaseServiceImpl<Long, VideoLessonStudyRecord>  implements VideoLessonStudyRecordService {
-	
-	@Autowired
-	private VideoLessonStudyRecordDao videoLessonStudyRecordDao;
+public class VideoLessonStudyRecordServiceImpl extends ServiceImpl<VideoLessonStudyRecordDao, VideoLessonStudyRecord> implements VideoLessonStudyRecordService {
 
-	@Override
-	public BaseDAO<Long, VideoLessonStudyRecord> getDAO() {
-		return videoLessonStudyRecordDao;
-	}
+    /**
+     * 分页查询
+     */
+     @Override
+    public IPage<VideoLessonStudyRecord> selectPage(IPage<VideoLessonStudyRecord> page, VideoLessonStudyRecord videoLessonStudyRecord){
+        return page.setRecords(baseMapper.selectPage(page, videoLessonStudyRecord));
+    }
 	
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/support/Condition.java

@@ -27,7 +27,7 @@ public class Condition {
 	 * @return IPage
 	 */
 	public static <T> IPage<T> getPage(Query query) {
-		Page<T> page = new Page<>(toInt(query.getCurrent(),1), toInt(query.getCurrent(),10));
+		Page<T> page = new Page<>(toInt(query.getCurrent(),1), toInt(query.getSize(),10));
 		page.setAsc(StringUtil.toStrArray(SqlKeyword.filter(query.getAscs())));
 		page.setDesc(StringUtil.toStrArray(SqlKeyword.filter(query.getDescs())));
 		return page;

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

@@ -1,104 +1,27 @@
 <?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">
-<!--
-这个文件是自动生成的。
-不要修改此文件。所有改动将在下次重新自动生成时丢失。
--->
+<!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} 
+	<resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.AlbumFavorite">
+            <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>  
+    
+    <!-- 表字段 -->
+    <sql id="baseColumns">
+         t.id_
+        , t.user_id_
+        , t.album_id_
+        , t.favorite_time_
+        , t.favorite_flag_
+        </sql> 
+    
+    <!-- 分页查询 -->
+    <select id="selectPage" resultMap="BaseResultMap">
+		SELECT         
+        	<include refid="baseColumns" />
+		FROM album_favorite t
 	</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>
+</mapper>

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

@@ -1,114 +1,29 @@
 <?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">
-<!--
-这个文件是自动生成的。
-不要修改此文件。所有改动将在下次重新自动生成时丢失。
--->
+<!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.AlbumMusicRelateDao">
-	
-	<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" >
-		SELECT * FROM album_music_relate WHERE id_ = #{id} 
+	<resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.AlbumMusicRelate">
+            <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>  
+    
+    <!-- 表字段 -->
+    <sql id="baseColumns">
+         t.id_
+        , t.album_id_
+        , t.music_sheet_id_
+        , t.sort_number_
+        , t.create_time_
+        , t.create_by_
+        </sql> 
+    
+    <!-- 分页查询 -->
+    <select id="selectPage" resultMap="BaseResultMap">
+		SELECT         
+        	<include refid="baseColumns" />
+		FROM album_music_relate t
 	</select>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="BaseResultMap">
-		SELECT * FROM album_music_relate ORDER BY id_
-	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-    <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_,sort_number_,create_time_,create_by_)
-        values
-        (#{albumId},#{musicSheetId},#{sortNumber},sysdate(),#{createBy})
-    </insert>
-
-    <update id="update" parameterType="AlbumMusicRelate">
-        update album_music_relate
-        <set>
-            <if test="albumId != null">
-                album_id_ = #{albumId},
-            </if>
-            <if test="musicSheetId != null">
-                music_sheet_id_ = #{musicSheetId},
-            </if>
-            <if test="sortNumber != null">
-                sort_number_ = #{sortNumber},
-            </if>
-            <if test="createTime != null">
-                create_time_ = #{createTime},
-            </if>
-            <if test="createBy != null">
-                create_by_ = #{createBy},
-            </if>
-        </set>
-        where id = #{id}
-    </update>
-
-    <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 album_id_ = #{albumId}
-        </if>
-        <if test="musicSheetId != null">
-            and music_sheet_id_ = #{musicSheetId}
-        </if>
-        <if test="sortNumber != null">
-            and sort_number_ = #{sortNumber}
-        </if>
-        <if test="createTime != null">
-            and create_time_ = #{createTime}
-        </if>
-        <if test="createBy != null">
-            and create_by_ = #{createBy}
-        </if>
-    </select>
-	
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
-		DELETE FROM album_music_relate WHERE id_ = #{id} 
-	</delete>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="BaseResultMap" parameterType="map">
-		SELECT * FROM album_music_relate ORDER BY id_ <include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM album_music_relate
-	</select>
-</mapper>
+</mapper>

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

@@ -1,183 +1,43 @@
 <?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">
-<!--
-这个文件是自动生成的。
-不要修改此文件。所有改动将在下次重新自动生成时丢失。
--->
+<!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.MusicAlbumDao">
-	
-	<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" >
-		SELECT * FROM music_album WHERE id_ = #{id} 
+	<resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.MusicAlbum">
+            <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>  
+    
+    <!-- 表字段 -->
+    <sql id="baseColumns">
+         t.id_
+        , t.album_name_
+        , t.album_desc_
+        , t.album_tag_
+        , t.album_cover_url_
+        , t.album_status_
+        , t.sort_number_
+        , t.hot_flag_
+        , t.top_flag_
+        , t.create_time_
+        , t.create_by_
+        , t.update_time_
+        , t.update_by_
+        </sql> 
+    
+    <!-- 分页查询 -->
+    <select id="selectPage" resultMap="BaseResultMap">
+		SELECT         
+        	<include refid="baseColumns" />
+		FROM music_album t
 	</select>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="BaseResultMap">
-		SELECT * FROM music_album ORDER BY id_
-	</select>
-
-    <delete id="delete" parameterType="MusicAlbum">
-        delete from music_album
-        where 1=1
-        <if test="albumName != null and albumName != ''">
-            and album_name_ = #{albumName}
-        </if>
-        <if test="albumDesc != null and albumDesc != ''">
-            and album_desc_ = #{albumDesc}
-        </if>
-        <if test="albumTag != null and albumTag != ''">
-            and album_tag_ = #{albumTag}
-        </if>
-        <if test="albumCoverUrl != null and albumCoverUrl != ''">
-            and album_cover_url_ = #{albumCoverUrl}
-        </if>
-        <if test="albumStatus != null and albumStatus != ''">
-            and album_status_ = #{albumStatus}
-        </if>
-        <if test="sortNumber != null and sortNumber != ''">
-            and sort_number_ = #{sortNumber}
-        </if>
-        <if test="hotFlag != null and hotFlag != ''">
-            and hot_flag_ = #{hotFlag}
-        </if>
-        <if test="topFlag != null and topFlag != ''">
-            and top_flag_ = #{topFlag}
-        </if>
-        <if test="createTime != null and createTime != ''">
-            and create_time_ = #{createTime}
-        </if>
-        <if test="createBy != null and createBy != ''">
-            and create_by_ = #{createBy}
-        </if>
-        <if test="updateTime != null and updateTime != ''">
-            and update_time_ = #{updateTime}
-        </if>
-        <if test="updateBy != null and updateBy != ''">
-            and update_by_ = #{updateBy}
-        </if>
-    </delete>
-
-    <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
-        <include refid="Base_Column_List" />
-        from music_album
-        where 1=1
-        <if test="albumName != null and albumName != ''">
-            and album_name_ = #{albumName}
-        </if>
-        <if test="albumDesc != null and albumDesc != ''">
-            and album_desc_ = #{albumDesc}
-        </if>
-        <if test="albumTag != null and albumTag != ''">
-            and album_tag_ = #{albumTag}
-        </if>
-        <if test="albumCoverUrl != null and albumCoverUrl != ''">
-            and album_cover_url_ = #{albumCoverUrl}
-        </if>
-        <if test="albumStatus != null">
-            and album_status_ = #{albumStatus}
-        </if>
-        <if test="sortNumber != null">
-            and sort_number_ = #{sortNumber}
-        </if>
-        <if test="hotFlag != null">
-            and hot_flag_ = #{hotFlag}
-        </if>
-        <if test="topFlag != null">
-            and top_flag_ = #{topFlag}
-        </if>
-        <if test="createTime != null">
-            and create_time_ = #{createTime}
-        </if>
-        <if test="createBy != null">
-            and create_by_ = #{createBy}
-        </if>
-        <if test="updateTime != null">
-            and update_time_ = #{updateTime}
-        </if>
-        <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>
+</mapper>

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

@@ -1,103 +1,27 @@
 <?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">
-<!--
-这个文件是自动生成的。
-不要修改此文件。所有改动将在下次重新自动生成时丢失。
--->
+<!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} 
+	<resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.MusicFavorite">
+            <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>  
+    
+    <!-- 表字段 -->
+    <sql id="baseColumns">
+         t.id_
+        , t.user_id_
+        , t.music_sheet_id_
+        , t.favorite_time_
+        , t.favorite_flag_
+        </sql> 
+    
+    <!-- 分页查询 -->
+    <select id="selectPage" resultMap="BaseResultMap">
+		SELECT         
+        	<include refid="baseColumns" />
+		FROM music_favorite t
 	</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>
+</mapper>

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

@@ -1,123 +1,31 @@
 <?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">
-<!--
-这个文件是自动生成的。
-不要修改此文件。所有改动将在下次重新自动生成时丢失。
--->
+<!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.MusicSheetAccompanimentDao">
-	
-	<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" >
-		SELECT * FROM music_sheet_accompaniment WHERE id_ = #{id} 
+	<resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.MusicSheetAccompaniment">
+            <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>  
+    
+    <!-- 表字段 -->
+    <sql id="baseColumns">
+         t.id_
+        , t.music_sheet_id_
+        , t.music_subject_
+        , t.audio_file_url_
+        , t.sort_number_
+        , t.create_time_
+        , t.create_by_
+        </sql> 
+    
+    <!-- 分页查询 -->
+    <select id="selectPage" resultMap="BaseResultMap">
+		SELECT         
+        	<include refid="baseColumns" />
+		FROM music_sheet_accompaniment t
 	</select>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="BaseResultMap">
-		SELECT * FROM music_sheet_accompaniment ORDER BY id_
-	</select>
-
-    <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_sheet_id_,music_subject_,audio_file_url_,sort_number_,create_time_,create_by_)
-        values
-        (#{musicSheetId},#{musicSubject},#{audioFileUrl},#{sortNumber},sysdate(),#{createBy})
-    </insert>
-
-    <update id="update" parameterType="MusicSheetAccompaniment">
-        update music_sheet_accompaniment
-        <set>
-            <if test="musicSheetId != null">
-                music_sheet_id_ = #{musicSheetId},
-            </if>
-            <if test="musicSubject != null and musicSubject != ''">
-                music_subject_ = #{musicSubject},
-            </if>
-            <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="createBy != null">
-                create_by_ = #{createBy},
-            </if>
-        </set>
-        where id = #{id}
-    </update>
-
-    <select id="findList" parameterType="MusicSheetAccompaniment" resultMap="BaseResultMap">
-        select
-        <include refid="Base_Column_List" />
-        from music_sheet_accompaniment
-        where 1=1
-        <if test="musicSheetId != null">
-            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 sort_number_ = #{sortNumber}
-        </if>
-        <if test="createTime != null">
-            and create_time_ = #{createTime}
-        </if>
-        <if test="createBy != null">
-            and create_by_ = #{createBy}
-        </if>
-    </select>
-	
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
-		DELETE FROM music_sheet_accompaniment WHERE id_ = #{id} 
-	</delete>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="BaseResultMap" parameterType="map">
-		SELECT * FROM music_sheet_accompaniment ORDER BY id_ <include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM music_sheet_accompaniment
-	</select>
-</mapper>
+</mapper>

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

@@ -1,293 +1,65 @@
 <?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">
-<!--
-这个文件是自动生成的。
-不要修改此文件。所有改动将在下次重新自动生成时丢失。
--->
+<!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.MusicSheetDao">
-	
-	<resultMap type="com.yonge.cooleshow.biz.dal.entity.MusicSheet" id="BaseResultMap">
-		<result column="id_" property="id" />
-		<result column="music_sheet_name_" property="musicSheetName" />
-		<result column="user_id_" property="userId" />
-		<result column="composer_" property="composer" />
-		<result column="music_subject_" property="musicSubject" />
-		<result column="audio_type_" property="audioType" />
-		<result column="music_tag_" property="musicTag" />
-		<result column="play_speed_" property="playSpeed" />
-		<result column="can_evaluate_" property="canEvaluate" />
-		<result column="show_fingering_" property="showFingering" />
-		<result column="charge_type_" property="chargeType" />
-		<result column="audit_status_" property="auditStatus" />
-		<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="has_beat_" property="hasBeat" />
-		<result column="create_time_" property="createTime" />
-		<result column="create_by_" property="createBy" />
-		<result column="update_time_" property="updateTime" />
-		<result column="update_by_" property="updateBy" />
-		<result column="remark_" property="remark" />
-	</resultMap>
-	
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="BaseResultMap" >
-		SELECT * FROM music_sheet WHERE id_ = #{id} 
+	<resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.MusicSheet">
+            <result column="id_" property="id" />
+	        <result column="music_sheet_name_" property="musicSheetName" />
+	        <result column="user_id_" property="userId" />
+	        <result column="composer_" property="composer" />
+	        <result column="music_subject_" property="musicSubject" />
+	        <result column="audio_type_" property="audioType" />
+	        <result column="music_tag_" property="musicTag" />
+	        <result column="play_speed_" property="playSpeed" />
+	        <result column="can_evaluate_" property="canEvaluate" />
+	        <result column="show_fingering_" property="showFingering" />
+	        <result column="charge_type_" property="chargeType" />
+	        <result column="audit_status_" property="auditStatus" />
+	        <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="has_beat_" property="hasBeat" />
+	        <result column="create_time_" property="createTime" />
+	        <result column="create_by_" property="createBy" />
+	        <result column="update_time_" property="updateTime" />
+	        <result column="update_by_" property="updateBy" />
+	        <result column="remark_" property="remark" />
+		</resultMap>  
+    
+    <!-- 表字段 -->
+    <sql id="baseColumns">
+         t.id_
+        , t.music_sheet_name_
+        , t.user_id_
+        , t.composer_
+        , t.music_subject_
+        , t.audio_type_
+        , t.music_tag_
+        , t.play_speed_
+        , t.can_evaluate_
+        , t.show_fingering_
+        , t.charge_type_
+        , t.audit_status_
+        , t.sort_number_
+        , t.top_flag_
+        , t.hot_flag_
+        , t.music_price_
+        , t.audio_file_url_
+        , t.xml_file_url_
+        , t.has_beat_
+        , t.create_time_
+        , t.create_by_
+        , t.update_time_
+        , t.update_by_
+        , t.remark_
+        </sql> 
+    
+    <!-- 分页查询 -->
+    <select id="selectPage" resultMap="BaseResultMap">
+		SELECT         
+        	<include refid="baseColumns" />
+		FROM music_sheet t
 	</select>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="BaseResultMap">
-		SELECT * FROM music_sheet ORDER BY id_
-	</select>
-
-    <delete id="delete" parameterType="MusicSheet">
-        delete from music_sheet
-        where 1=1
-        <if test="musicSheetName != null and musicSheetName != ''">
-            and music_sheet_name_ = #{musicSheetName}
-        </if>
-        <if test="userId != null and userId != ''">
-            and user_id_ = #{userId}
-        </if>
-        <if test="composer != null and composer != ''">
-            and composer_ = #{composer}
-        </if>
-        <if test="musicSubject != null and musicSubject != ''">
-            and music_subject_ = #{musicSubject}
-        </if>
-        <if test="audioType != null and audioType != ''">
-            and audio_type_ = #{audioType}
-        </if>
-        <if test="musicTag != null and musicTag != ''">
-            and music_tag_ = #{musicTag}
-        </if>
-        <if test="playSpeed != null and playSpeed != ''">
-            and play_speed_ = #{playSpeed}
-        </if>
-        <if test="canEvaluate != null and canEvaluate != ''">
-            and can_evaluate_ = #{canEvaluate}
-        </if>
-        <if test="showFingering != null and showFingering != ''">
-            and show_fingering_ = #{showFingering}
-        </if>
-        <if test="chargeType != null and chargeType != ''">
-            and charge_type_ = #{chargeType}
-        </if>
-        <if test="auditStatus != null and auditStatus != ''">
-            and audit_status_ = #{auditStatus}
-        </if>
-        <if test="sortNumber != null and sortNumber != ''">
-            and sort_number_ = #{sortNumber}
-        </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="musicPrice != null and musicPrice != ''">
-            and music_price_ = #{musicPrice}
-        </if>
-        <if test="audioFileUrl != null and audioFileUrl != ''">
-            and audio_file_url_ = #{audioFileUrl}
-        </if>
-        <if test="xmlFileUrl != null and xmlFileUrl != ''">
-            and xml_file_url_ = #{xmlFileUrl}
-        </if>
-        <if test="hasBeat != null and hasBeat != ''">
-            and has_beat_ = #{hasBeat}
-        </if>
-        <if test="createTime != null and createTime != ''">
-            and create_time_ = #{createTime}
-        </if>
-        <if test="createBy != null and createBy != ''">
-            and create_by_ = #{createBy}
-        </if>
-        <if test="updateTime != null and updateTime != ''">
-            and update_time_ = #{updateTime}
-        </if>
-        <if test="updateBy != null and updateBy != ''">
-            and update_by_ = #{updateBy}
-        </if>
-        <if test="remark != null and remark != ''">
-            and remark_ = #{remark}
-        </if>
-    </delete>
-
-    <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="musicSheetName != null and musicSheetName != ''">
-            and music_sheet_name_ = #{musicSheetName}
-        </if>
-        <if test="userId != null">
-            and user_id_ = #{userId}
-        </if>
-        <if test="composer != null and composer != ''">
-            and composer_ = #{composer}
-        </if>
-        <if test="musicSubject != null and musicSubject != ''">
-            and music_subject_ = #{musicSubject}
-        </if>
-        <if test="audioType != null and audioType != ''">
-            and audio_type_ = #{audioType}
-        </if>
-        <if test="musicTag != null and musicTag != ''">
-            and music_tag_ = #{musicTag}
-        </if>
-        <if test="playSpeed != null">
-            and play_speed_ = #{playSpeed}
-        </if>
-        <if test="canEvaluate != null">
-            and can_evaluate_ = #{canEvaluate}
-        </if>
-        <if test="showFingering != null">
-            and show_fingering_ = #{showFingering}
-        </if>
-        <if test="chargeType != null">
-            and charge_type_ = #{chargeType}
-        </if>
-        <if test="auditStatus != null">
-            and audit_status_ = #{auditStatus}
-        </if>
-        <if test="sortNumber != null">
-            and sort_number_ = #{sortNumber}
-        </if>
-        <if test="topFlag != null">
-            and top_flag_ = #{topFlag}
-        </if>
-        <if test="hotFlag != null">
-            and hot_flag_ = #{hotFlag}
-        </if>
-        <if test="musicPrice != null">
-            and music_price_ = #{musicPrice}
-        </if>
-        <if test="audioFileUrl != null and audioFileUrl != ''">
-            and audio_file_url_ = #{audioFileUrl}
-        </if>
-        <if test="xmlFileUrl != null and xmlFileUrl != ''">
-            and xml_file_url_ = #{xmlFileUrl}
-        </if>
-        <if test="hasBeat != null">
-            and has_beat_ = #{hasBeat}
-        </if>
-        <if test="createTime != null">
-            and create_time_ = #{createTime}
-        </if>
-        <if test="createBy != null">
-            and create_by_ = #{createBy}
-        </if>
-        <if test="updateTime != null">
-            and update_time_ = #{updateTime}
-        </if>
-        <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>
+</mapper>

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

@@ -1,133 +1,33 @@
 <?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">
-<!--
-这个文件是自动生成的。
-不要修改此文件。所有改动将在下次重新自动生成时丢失。
--->
+<!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.MusicSheetPurchaseRecordDao">
-	
-	<resultMap type="com.yonge.cooleshow.biz.dal.entity.MusicSheetPurchaseRecord" id="BaseResultMap">
-		<result column="id_" property="id" />
-		<result column="music_sheet_id_" property="musicSheetId" />
-		<result column="teacher_id_" property="teacherId" />
-		<result column="order_no_" property="orderNo" />
-		<result column="student_id_" property="studentId" />
-		<result column="purchase_time_" property="purchaseTime" />
-		<result column="purchase_price_" property="purchasePrice" />
-		<result column="order_status_" property="orderStatus" />
-	</resultMap>
-	
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="BaseResultMap" >
-		SELECT * FROM music_sheet_purchase_record WHERE id_ = #{id} 
+	<resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.MusicSheetPurchaseRecord">
+            <result column="id_" property="id" />
+	        <result column="music_sheet_id_" property="musicSheetId" />
+	        <result column="teacher_id_" property="teacherId" />
+	        <result column="order_no_" property="orderNo" />
+	        <result column="student_id_" property="studentId" />
+	        <result column="purchase_time_" property="purchaseTime" />
+	        <result column="purchase_price_" property="purchasePrice" />
+	        <result column="order_status_" property="orderStatus" />
+		</resultMap>  
+    
+    <!-- 表字段 -->
+    <sql id="baseColumns">
+         t.id_
+        , t.music_sheet_id_
+        , t.teacher_id_
+        , t.order_no_
+        , t.student_id_
+        , t.purchase_time_
+        , t.purchase_price_
+        , t.order_status_
+        </sql> 
+    
+    <!-- 分页查询 -->
+    <select id="selectPage" resultMap="BaseResultMap">
+		SELECT         
+        	<include refid="baseColumns" />
+		FROM music_sheet_purchase_record t
 	</select>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="BaseResultMap">
-		SELECT * FROM music_sheet_purchase_record ORDER BY id_
-	</select>
-
-    <delete id="delete" parameterType="MusicSheetPurchaseRecord">
-        delete from music_sheet_purchase_record
-        where 1=1
-        <if test="musicSheetId != null and musicSheetId != ''">
-            and music_sheet_id_ = #{musicSheetId}
-        </if>
-        <if test="teacherId != null and teacherId != ''">
-            and teacher_id_ = #{teacherId}
-        </if>
-        <if test="orderNo != null and orderNo != ''">
-            and order_no_ = #{orderNo}
-        </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="purchasePrice != null and purchasePrice != ''">
-            and purchase_price_ = #{purchasePrice}
-        </if>
-        <if test="orderStatus != null and orderStatus != ''">
-            and order_status_ = #{orderStatus}
-        </if>
-    </delete>
-
-    <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
-        <include refid="Base_Column_List" />
-        from music_sheet_purchase_record
-        where 1=1
-        <if test="musicSheetId != null">
-            and music_sheet_id_ = #{musicSheetId}
-        </if>
-        <if test="teacherId != null">
-            and teacher_id_ = #{teacherId}
-        </if>
-        <if test="orderNo != null and orderNo != ''">
-            and order_no_ = #{orderNo}
-        </if>
-        <if test="studentId != null">
-            and student_id_ = #{studentId}
-        </if>
-        <if test="purchaseTime != null">
-            and purchase_time_ = #{purchaseTime}
-        </if>
-        <if test="purchasePrice != null">
-            and purchase_price_ = #{purchasePrice}
-        </if>
-        <if test="orderStatus != null">
-            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>
+</mapper>

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

@@ -50,4 +50,9 @@
         	<include refid="baseColumns" />
 		FROM teacher t
 	</select>
+	<select id="detail1" resultMap="BaseResultMap">
+		SELECT
+		<include refid="baseColumns" />
+		FROM teacher t where  t.user_id_ = #{userId}
+	</select>
 </mapper>

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

@@ -1,103 +1,27 @@
 <?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">
-<!--
-这个文件是自动生成的。
-不要修改此文件。所有改动将在下次重新自动生成时丢失。
--->
+<!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.VideoLessonEvaluateDao">
-	
-	<resultMap type="com.yonge.cooleshow.biz.dal.entity.VideoLessonEvaluate" id="BaseResultMap">
-		<result column="id_" property="id" />
-		<result column="video_id_" property="videoId" />
-		<result column="student_id_" property="studentId" />
-		<result column="content_" property="content" />
-		<result column="evaluate_time_" property="evaluateTime" />
-	</resultMap>
-	
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="BaseResultMap" >
-		SELECT * FROM video_lesson_evaluate WHERE id_ = #{id} 
+	<resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.VideoLessonEvaluate">
+            <result column="id_" property="id" />
+	        <result column="video_id_" property="videoId" />
+	        <result column="student_id_" property="studentId" />
+	        <result column="content_" property="content" />
+	        <result column="evaluate_time_" property="evaluateTime" />
+		</resultMap>  
+    
+    <!-- 表字段 -->
+    <sql id="baseColumns">
+         t.id_
+        , t.video_id_
+        , t.student_id_
+        , t.content_
+        , t.evaluate_time_
+        </sql> 
+    
+    <!-- 分页查询 -->
+    <select id="selectPage" resultMap="BaseResultMap">
+		SELECT         
+        	<include refid="baseColumns" />
+		FROM video_lesson_evaluate t
 	</select>
-	
-	<!-- 全查询 -->
-	<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_id_,student_id_,content_,evaluate_time_)
-        values
-        (#{videoId},#{studentId},#{content},#{evaluateTime})
-    </insert>
-
-    <update id="update" parameterType="VideoLessonEvaluate">
-        update video_lesson_evaluate
-        <set>
-            <if test="videoId != null">
-                video_id_ = #{videoId},
-            </if>
-            <if test="studentId != null">
-                student_id_ = #{studentId},
-            </if>
-            <if test="content != null and content != ''">
-                content_ = #{content},
-            </if>
-            <if test="evaluateTime != null">
-                evaluate_time_ = #{evaluateTime},
-            </if>
-        </set>
-        where id = #{id}
-    </update>
-
-    <select id="findList" parameterType="VideoLessonEvaluate" resultMap="BaseResultMap">
-        select
-        <include refid="Base_Column_List" />
-        from video_lesson_evaluate
-        where 1=1
-        <if test="videoId != null">
-            and video_id_ = #{videoId}
-        </if>
-        <if test="studentId != null">
-            and student_id_ = #{studentId}
-        </if>
-        <if test="content != null and content != ''">
-            and content_ = #{content}
-        </if>
-        <if test="evaluateTime != null">
-            and evaluate_time_ = #{evaluateTime}
-        </if>
-    </select>
-	
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
-		DELETE FROM video_lesson_evaluate WHERE id_ = #{id} 
-	</delete>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="BaseResultMap" parameterType="map">
-		SELECT * FROM video_lesson_evaluate ORDER BY id_ <include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM video_lesson_evaluate
-	</select>
-</mapper>
+</mapper>

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

@@ -1,173 +1,41 @@
 <?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">
-<!--
-这个文件是自动生成的。
-不要修改此文件。所有改动将在下次重新自动生成时丢失。
--->
+<!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} 
+	<resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.VideoLessonGroupDetail">
+            <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>  
+    
+    <!-- 表字段 -->
+    <sql id="baseColumns">
+         t.id_
+        , t.video_lesson_group_id_
+        , t.video_title_
+        , t.video_content_
+        , t.video_url_
+        , t.cover_url_
+        , t.charge_flag_
+        , t.sort_number_
+        , t.teacher_id_
+        , t.create_time_
+        , t.update_by_
+        , t.update_time_
+        </sql> 
+    
+    <!-- 分页查询 -->
+    <select id="selectPage" resultMap="BaseResultMap">
+		SELECT         
+        	<include refid="baseColumns" />
+		FROM video_lesson_group_detail t
 	</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>
+</mapper>

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

@@ -1,203 +1,47 @@
 <?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">
-<!--
-这个文件是自动生成的。
-不要修改此文件。所有改动将在下次重新自动生成时丢失。
--->
+<!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.VideoLessonGroupDao">
-	
-	<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_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="sort_number_" property="sortNumber" />
-		<result column="lesson_tag_" property="lessonTag" />
-		<result column="top_flag_" property="topFlag" />
-		<result column="hot_flag_" property="hotFlag" />
-		<result column="audit_status_" property="auditStatus" />
-		<result column="create_time_" property="createTime" />
-		<result column="update_time_" property="updateTime" />
-	</resultMap>
-	
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="BaseResultMap" >
-		SELECT * FROM video_lesson_group WHERE id_ = #{id} 
+	<resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.VideoLessonGroup">
+            <result column="id_" property="id" />
+	        <result column="lesson_name_" property="lessonName" />
+	        <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="sort_number_" property="sortNumber" />
+	        <result column="lesson_tag_" property="lessonTag" />
+	        <result column="top_flag_" property="topFlag" />
+	        <result column="hot_flag_" property="hotFlag" />
+	        <result column="audit_status_" property="auditStatus" />
+	        <result column="create_time_" property="createTime" />
+	        <result column="update_time_" property="updateTime" />
+		</resultMap>  
+    
+    <!-- 表字段 -->
+    <sql id="baseColumns">
+         t.id_
+        , t.lesson_name_
+        , t.lesson_subject_
+        , t.lesson_desc_
+        , t.lesson_price_
+        , t.lesson_cover_url_
+        , t.teacher_id_
+        , t.lesson_count_
+        , t.sort_number_
+        , t.lesson_tag_
+        , t.top_flag_
+        , t.hot_flag_
+        , t.audit_status_
+        , t.create_time_
+        , t.update_time_
+        </sql> 
+    
+    <!-- 分页查询 -->
+    <select id="selectPage" resultMap="BaseResultMap">
+		SELECT         
+        	<include refid="baseColumns" />
+		FROM video_lesson_group t
 	</select>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="BaseResultMap">
-		SELECT * FROM video_lesson_group ORDER BY id_
-	</select>
-
-    <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},#{lessonSubject},#{lessonDesc},#{lessonPrice},#{lessonCoverUrl},#{teacherId},#{lessonCount},#{sortNumber},#{lessonTag},#{topFlag},#{hotFlag},#{auditStatus},sysdate(),#{updateTime})
-    </insert>
-
-    <update id="update" parameterType="VideoLessonGroup">
-        update video_lesson_group
-        <set>
-            <if test="lessonName != null and lessonName != ''">
-                lesson_name_ = #{lessonName},
-            </if>
-            <if test="lessonSubject != null and lessonSubject != ''">
-                lesson_subject_ = #{lessonSubject},
-            </if>
-            <if test="lessonDesc != null and lessonDesc != ''">
-                lesson_desc_ = #{lessonDesc},
-            </if>
-            <if test="lessonPrice != null">
-                lesson_price_ = #{lessonPrice},
-            </if>
-            <if test="lessonCoverUrl != null and lessonCoverUrl != ''">
-                lesson_cover_url_ = #{lessonCoverUrl},
-            </if>
-            <if test="teacherId != null">
-                teacher_id_ = #{teacherId},
-            </if>
-            <if test="lessonCount != null">
-                lesson_count_ = #{lessonCount},
-            </if>
-            <if test="sortNumber != null">
-                sort_number_ = #{sortNumber},
-            </if>
-            <if test="lessonTag != null and lessonTag != ''">
-                lesson_tag_ = #{lessonTag},
-            </if>
-            <if test="topFlag != null">
-                top_flag_ = #{topFlag},
-            </if>
-            <if test="hotFlag != null">
-                hot_flag_ = #{hotFlag},
-            </if>
-            <if test="auditStatus != null">
-                audit_status_ = #{auditStatus},
-            </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="VideoLessonGroup" resultMap="BaseResultMap">
-        select
-        <include refid="Base_Column_List" />
-        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 lesson_price_ = #{lessonPrice}
-        </if>
-        <if test="lessonCoverUrl != null and lessonCoverUrl != ''">
-            and lesson_cover_url_ = #{lessonCoverUrl}
-        </if>
-        <if test="teacherId != null">
-            and teacher_id_ = #{teacherId}
-        </if>
-        <if test="lessonCount != null">
-            and lesson_count_ = #{lessonCount}
-        </if>
-        <if test="sortNumber != null">
-            and sort_number_ = #{sortNumber}
-        </if>
-        <if test="lessonTag != null and lessonTag != ''">
-            and lesson_tag_ = #{lessonTag}
-        </if>
-        <if test="topFlag != null">
-            and top_flag_ = #{topFlag}
-        </if>
-        <if test="hotFlag != null">
-            and hot_flag_ = #{hotFlag}
-        </if>
-        <if test="auditStatus != null">
-            and audit_status_ = #{auditStatus}
-        </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_group WHERE id_ = #{id} 
-	</delete>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="BaseResultMap" parameterType="map">
-		SELECT * FROM video_lesson_group ORDER BY id_ <include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM video_lesson_group
-	</select>
-</mapper>
+</mapper>

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

@@ -1,123 +1,31 @@
 <?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">
-<!--
-这个文件是自动生成的。
-不要修改此文件。所有改动将在下次重新自动生成时丢失。
--->
+<!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.VideoLessonPurchaseRecordDao">
-	
-	<resultMap type="com.yonge.cooleshow.biz.dal.entity.VideoLessonPurchaseRecord" id="BaseResultMap">
-		<result column="id_" property="id" />
-		<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" />
-		<result column="order_no_" property="orderNo" />
-		<result column="order_status_" property="orderStatus" />
-	</resultMap>
-	
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="BaseResultMap" >
-		SELECT * FROM video_lesson_purchase_record WHERE id_ = #{id} 
+	<resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.VideoLessonPurchaseRecord">
+            <result column="id_" property="id" />
+	        <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" />
+	        <result column="order_no_" property="orderNo" />
+	        <result column="order_status_" property="orderStatus" />
+		</resultMap>  
+    
+    <!-- 表字段 -->
+    <sql id="baseColumns">
+         t.id_
+        , t.video_lesson_group_id_
+        , t.student_id_
+        , t.purchase_time_
+        , t.pay_money_
+        , t.order_no_
+        , t.order_status_
+        </sql> 
+    
+    <!-- 分页查询 -->
+    <select id="selectPage" resultMap="BaseResultMap">
+		SELECT         
+        	<include refid="baseColumns" />
+		FROM video_lesson_purchase_record t
 	</select>
-	
-	<!-- 全查询 -->
-	<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
-        (video_lesson_group_id_,student_id_,purchase_time_,pay_money_,order_no_,order_status_)
-        values
-        (#{videoLessonGroupId},#{studentId},#{purchaseTime},#{payMoney},#{orderNo},#{orderStatus})
-    </insert>
-
-    <update id="update" parameterType="VideoLessonPurchaseRecord">
-        update video_lesson_purchase_record
-        <set>
-            <if test="videoLessonGroupId != null">
-                video_lesson_group_id_ = #{videoLessonGroupId},
-            </if>
-            <if test="studentId != null">
-                student_id_ = #{studentId},
-            </if>
-            <if test="purchaseTime != null">
-                purchase_time_ = #{purchaseTime},
-            </if>
-            <if test="payMoney != null">
-                pay_money_ = #{payMoney},
-            </if>
-            <if test="orderNo != null and orderNo != ''">
-                order_no_ = #{orderNo},
-            </if>
-            <if test="orderStatus != null">
-                order_status_ = #{orderStatus},
-            </if>
-        </set>
-        where id = #{id}
-    </update>
-
-    <select id="findList" parameterType="VideoLessonPurchaseRecord" resultMap="BaseResultMap">
-        select
-        <include refid="Base_Column_List" />
-        from video_lesson_purchase_record
-        where 1=1
-        <if test="videoLessonGroupId != null">
-            and video_lesson_group_id_ = #{videoLessonGroupId}
-        </if>
-        <if test="studentId != null">
-            and student_id_ = #{studentId}
-        </if>
-        <if test="purchaseTime != null">
-            and purchase_time_ = #{purchaseTime}
-        </if>
-        <if test="payMoney != null">
-            and pay_money_ = #{payMoney}
-        </if>
-        <if test="orderNo != null and orderNo != ''">
-            and order_no_ = #{orderNo}
-        </if>
-        <if test="orderStatus != null">
-            and order_status_ = #{orderStatus}
-        </if>
-    </select>
-	
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
-		DELETE FROM video_lesson_purchase_record WHERE id_ = #{id} 
-	</delete>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="BaseResultMap" parameterType="map">
-		SELECT * FROM video_lesson_purchase_record ORDER BY id_ <include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM video_lesson_purchase_record
-	</select>
-</mapper>
+</mapper>

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

@@ -1,123 +1,31 @@
 <?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">
-<!--
-这个文件是自动生成的。
-不要修改此文件。所有改动将在下次重新自动生成时丢失。
--->
+<!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.VideoLessonStudyRecordDao">
-	
-	<resultMap type="com.yonge.cooleshow.biz.dal.entity.VideoLessonStudyRecord" id="BaseResultMap">
-		<result column="id_" property="id" />
-		<result column="video_lesson_group_id_" property="videoLessonGroupId" />
-		<result column="video_id_" property="videoId" />
-		<result column="student_id_" property="studentId" />
-		<result column="finish_flag_" property="finishFlag" />
-		<result column="start_time_" property="startTime" />
-		<result column="finish_time_" property="finishTime" />
-	</resultMap>
-	
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="BaseResultMap" >
-		SELECT * FROM video_lesson_study_record WHERE id_ = #{id} 
+	<resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.VideoLessonStudyRecord">
+            <result column="id_" property="id" />
+	        <result column="video_lesson_group_id_" property="videoLessonGroupId" />
+	        <result column="video_id_" property="videoId" />
+	        <result column="student_id_" property="studentId" />
+	        <result column="finish_flag_" property="finishFlag" />
+	        <result column="start_time_" property="startTime" />
+	        <result column="finish_time_" property="finishTime" />
+		</resultMap>  
+    
+    <!-- 表字段 -->
+    <sql id="baseColumns">
+         t.id_
+        , t.video_lesson_group_id_
+        , t.video_id_
+        , t.student_id_
+        , t.finish_flag_
+        , t.start_time_
+        , t.finish_time_
+        </sql> 
+    
+    <!-- 分页查询 -->
+    <select id="selectPage" resultMap="BaseResultMap">
+		SELECT         
+        	<include refid="baseColumns" />
+		FROM video_lesson_study_record t
 	</select>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="BaseResultMap">
-		SELECT * FROM video_lesson_study_record ORDER BY id_
-	</select>
-
-    <delete id="delete" parameterType="VideoLessonStudyRecord">
-        delete from video_lesson_study_record
-        where 1=1
-        <if test="videoLessonGroupId != null and videoLessonGroupId != ''">
-            and video_lesson_group_id_ = #{videoLessonGroupId}
-        </if>
-        <if test="videoId != null and videoId != ''">
-            and video_id_ = #{videoId}
-        </if>
-        <if test="studentId != null and studentId != ''">
-            and student_id_ = #{studentId}
-        </if>
-        <if test="finishFlag != null and finishFlag != ''">
-            and finish_flag_ = #{finishFlag}
-        </if>
-        <if test="startTime != null and startTime != ''">
-            and start_time_ = #{startTime}
-        </if>
-        <if test="finishTime != null and finishTime != ''">
-            and finish_time_ = #{finishTime}
-        </if>
-    </delete>
-
-    <insert id="insert" parameterType="VideoLessonStudyRecord">
-        insert into video_lesson_study_record
-        (video_lesson_group_id_,video_id_,student_id_,finish_flag_,start_time_,finish_time_)
-        values
-        (#{videoLessonGroupId},#{videoId},#{studentId},#{finishFlag},#{startTime},#{finishTime})
-    </insert>
-
-    <update id="update" parameterType="VideoLessonStudyRecord">
-        update video_lesson_study_record
-        <set>
-            <if test="videoLessonGroupId != null">
-                video_lesson_group_id_ = #{videoLessonGroupId},
-            </if>
-            <if test="videoId != null">
-                video_id_ = #{videoId},
-            </if>
-            <if test="studentId != null">
-                student_id_ = #{studentId},
-            </if>
-            <if test="finishFlag != null">
-                finish_flag_ = #{finishFlag},
-            </if>
-            <if test="startTime != null">
-                start_time_ = #{startTime},
-            </if>
-            <if test="finishTime != null">
-                finish_time_ = #{finishTime},
-            </if>
-        </set>
-        where id = #{id}
-    </update>
-
-    <select id="findList" parameterType="VideoLessonStudyRecord" resultMap="BaseResultMap">
-        select
-        <include refid="Base_Column_List" />
-        from video_lesson_study_record
-        where 1=1
-        <if test="videoLessonGroupId != null">
-            and video_lesson_group_id_ = #{videoLessonGroupId}
-        </if>
-        <if test="videoId != null">
-            and video_id_ = #{videoId}
-        </if>
-        <if test="studentId != null">
-            and student_id_ = #{studentId}
-        </if>
-        <if test="finishFlag != null">
-            and finish_flag_ = #{finishFlag}
-        </if>
-        <if test="startTime != null">
-            and start_time_ = #{startTime}
-        </if>
-        <if test="finishTime != null">
-            and finish_time_ = #{finishTime}
-        </if>
-    </select>
-	
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
-		DELETE FROM video_lesson_study_record WHERE id_ = #{id} 
-	</delete>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="BaseResultMap" parameterType="map">
-		SELECT * FROM video_lesson_study_record ORDER BY id_ <include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM video_lesson_study_record
-	</select>
-</mapper>
+</mapper>

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/TeacherController.java

@@ -38,6 +38,15 @@ public class TeacherController extends BaseController {
 		Teacher detail = teacherService.getOne(Condition.getQueryWrapper(teacher));
 		return succeed(detail);
 	}
+
+	/**
+	 * 查询单条
+	 */
+	@GetMapping("/detail1")
+	@ApiOperation(value = "详情", notes = "传入teacher")
+	public HttpResponseResult<Teacher> detail1(Teacher teacher) {
+		return succeed(teacherService.detail1(teacher.getUserId()));
+	}
     
     
     /**

toolset/utils/src/main/java/com/yonge/toolset/utils/string/StringUtil.java

@@ -155,7 +155,7 @@ public class StringUtil {
      * @return 结果
      */
     public static String[] toStrArray(String split, String str) {
-        if (isEmpty(split)) {
+        if (isEmpty(str)) {
             return new String[]{};
         }
         return str.split(split);