Merge remote-tracking branch 'origin/master'

.gitignore

@@ -22,11 +22,13 @@ mvnw.cmd
 *.iml
 *.ipr
 /toolset/codegen/src/main/resources/generateConfigration.xml
+/cooleshow-user/user-admin/src/main/resources/bootstrap-dev.yml
 
 ### 忽略子模块的文件 ###
 **/*.ims
 **/*.iml
 **/*.ipr
+**/dep.txt
 **/.mvn/
 **/.idea/
 **/out/
@@ -44,11 +46,8 @@ mvnw.cmd
 /nbdist/
 /.nb-gradle/
 
-!.gitignore
 *.class
 .metadata
 target
 *.classpath
-.settings
-.project
 /bin/

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/entity/SysMenu.java

@@ -66,6 +66,15 @@ public class SysMenu {
 	private String delFlag;
 
 	private Integer hid;
+	
+	@ApiModelProperty(value = "是否固定在 tagsView 栏上",required = false)
+	private Boolean isAffix;
+	
+	@ApiModelProperty(value = "是否内嵌窗口",required = false)
+	private Boolean isIframe;
+	
+	@ApiModelProperty(value = "外链地址",required = false)
+	private String linkPath;
 
 	@ApiModelProperty(value = "子节点列表",required = false)
 	private List<SysMenu> sysMenus;
@@ -208,6 +217,30 @@ public class SysMenu {
 		return this.delFlag;
 	}
 
+	public Boolean getIsAffix() {
+		return isAffix;
+	}
+
+	public void setIsAffix(Boolean isAffix) {
+		this.isAffix = isAffix;
+	}
+
+	public Boolean getIsIframe() {
+		return isIframe;
+	}
+
+	public void setIsIframe(Boolean isIframe) {
+		this.isIframe = isIframe;
+	}
+
+	public String getLinkPath() {
+		return linkPath;
+	}
+
+	public void setLinkPath(String linkPath) {
+		this.linkPath = linkPath;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

cooleshow-auth/auth-server/pom.xml

@@ -1,91 +1,96 @@
 <?xml version="1.0"?>
 <project
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>com.yonge.cooleshow</groupId>
-		<artifactId>cooleshow-auth</artifactId>
-		<version>1.0</version>
-	</parent>
-	<groupId>com.yonge.cooleshow</groupId>
-	<artifactId>auth-server</artifactId>
-	<version>1.0</version>
-	<name>auth-server</name>
-	<url>http://maven.apache.org</url>
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-	</properties>
-	<dependencies>
+        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+        xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.yonge.cooleshow</groupId>
+        <artifactId>cooleshow-auth</artifactId>
+        <version>1.0</version>
+    </parent>
+    <groupId>com.yonge.cooleshow</groupId>
+    <artifactId>auth-server</artifactId>
+    <version>1.0</version>
+    <name>auth-server</name>
+    <url>http://maven.apache.org</url>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+    <dependencies>
 
-		<dependency>
-			<groupId>com.alibaba.cloud</groupId>
-			<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-		</dependency>
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-oauth2</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-security</artifactId>
+        </dependency>
 
-		<dependency>
-			<groupId>com.alibaba.cloud</groupId>
-			<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-		</dependency>
+        <!-- swagger-spring-boot -->
+        <dependency>
+            <groupId>com.spring4all</groupId>
+            <artifactId>swagger-spring-boot-starter</artifactId>
+        </dependency>
 
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-oauth2</artifactId>
-		</dependency>
+        <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>swagger-bootstrap-ui</artifactId>
+        </dependency>
 
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-security</artifactId>
-		</dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid-spring-boot-starter</artifactId>
+        </dependency>
 
-		<!-- swagger-spring-boot -->
-		<dependency>
-			<groupId>com.spring4all</groupId>
-			<artifactId>swagger-spring-boot-starter</artifactId>
-		</dependency>
+        <dependency>
+            <groupId>com.yonge.cooleshow</groupId>
+            <artifactId>auth-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.yonge.toolset</groupId>
+            <artifactId>audit-log</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>freemarker</artifactId>
+                    <groupId>org.freemarker</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
 
-		<dependency>
-			<groupId>com.github.xiaoymin</groupId>
-			<artifactId>swagger-bootstrap-ui</artifactId>
-		</dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-pool2</artifactId>
+        </dependency>
 
-		<dependency>
-			<groupId>com.alibaba</groupId>
-			<artifactId>druid-spring-boot-starter</artifactId>
-		</dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
 
-		<dependency>
-			<groupId>com.yonge.cooleshow</groupId>
-			<artifactId>auth-api</artifactId>
-		</dependency>
         <dependency>
 			<groupId>com.yonge.toolset</groupId>
-			<artifactId>audit-log</artifactId>
-			<exclusions>
-				<exclusion>
-					<artifactId>freemarker</artifactId>
-					<groupId>org.freemarker</groupId>
-				</exclusion>
-			</exclusions>
-		</dependency>
+			<artifactId>thirdparty-component</artifactId>
+        </dependency>
+    </dependencies>
 
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-pool2</artifactId>
-		</dependency>
-		
-		<dependency>
-			<groupId>mysql</groupId>
-			<artifactId>mysql-connector-java</artifactId>
-		</dependency>
-	</dependencies>
-	
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
 </project>

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/AuthServerApplication.java

@@ -18,7 +18,7 @@ import com.spring4all.swagger.EnableSwagger2Doc;
 @EnableDiscoveryClient
 @EnableFeignClients
 @MapperScan("com.yonge.cooleshow.auth.dal.dao")
-@ComponentScan(basePackages={"com.yonge.cooleshow", "com.yonge.toolset.log"})
+@ComponentScan(basePackages={"com.yonge.cooleshow", "com.yonge.toolset.log","com.yonge.toolset.thirdparty"})
 @Configuration
 @EnableSwagger2Doc
 @EnableAsync

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/config/ResourceServerConfig.java

@@ -26,7 +26,16 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
 	@Override
 	public void configure(HttpSecurity http) throws Exception {
 		http.csrf().disable().exceptionHandling().accessDeniedHandler(baseAccessDeniedHandler).authenticationEntryPoint(baseAuthenticationEntryPoint).and()
-				.authorizeRequests().antMatchers("/task/**", "/user/updatePassword", "/user/noAuth/queryUserByPhone", "/user/queryUserByPhone", "/user/add", "/user/queryUserById/*").hasIpAddress("0.0.0.0/0")
+				.authorizeRequests().antMatchers(
+						"/task/**",
+				"/user/updatePassword",
+				"/user/noAuth/queryUserByPhone",
+				"/user/queryUserByPhone",
+				"/user/add",
+				"/user/updatePasswordByOldPassword",
+				"/user/updatePhone",
+				"/user/realNameAuth",
+				"/user/queryUserById/*").hasIpAddress("0.0.0.0/0")
 				.anyRequest().authenticated().and().httpBasic();
 	}
 

cooleshow-auth/auth-server/src/main/resources/config/mybatis/SysMenuMapper.xml

@@ -24,6 +24,9 @@
         <result column="del_flag_" property="delFlag"/>
         <result column="hidden_" property="hid"/>
         <result column="memo_" property="memo"/>
+        <result column="is_affix_" property="isAffix"/>
+        <result column="is_iframe_" property="isIframe"/>
+        <result column="link_path_" property="linkPath"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->

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

@@ -0,0 +1,100 @@
+package com.yonge.cooleshow.admin.controller;
+
+import javax.validation.Valid;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
+import com.github.pagehelper.PageHelper;
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.biz.dal.entity.AlbumFavorite;
+import com.yonge.cooleshow.biz.dal.service.AlbumFavoriteService;
+
+/**
+ * 专辑收藏表 web 控制层
+ * @author yzp
+ * @date 2022-03-22 16:40:36
+ * @version v1.0
+ **/
+@RestController
+@RequestMapping("/admin/favor/album")
+@Api(tags = "专辑收藏表 web 控制层")
+public class AlbumFavoriteController extends BaseController {
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
+
+	@Autowired
+	private AlbumFavoriteService albumFavoriteService;
+
+	@ApiOperation(value = "新增")
+    @PostMapping("/create")
+    public Object create(@Valid @RequestBody AlbumFavorite albumFavorite) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+
+        //albumFavorite.setCreateBy(sysUser.getId());
+        //albumFavorite.setCreateTime(new Date());
+        albumFavoriteService.insert(albumFavorite);
+        return succeed();
+    }
+
+    @ApiOperation(value = "删除")
+    @PostMapping("/delete/{id}")
+    public Object delete(@PathVariable Long id) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+
+        albumFavoriteService.delete(id);
+        return succeed();
+    }
+
+    @ApiOperation(value = "修改")
+    @PostMapping("/update")
+    public Object update(@Valid @RequestBody AlbumFavorite albumFavorite) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+        if (albumFavorite.getId()==null){
+            return failed("缺少ID");
+        }
+
+        //albumFavorite.setUpdateBy(sysUser.getId());
+        //albumFavorite.setUpdateTime(new Date());
+        albumFavoriteService.update(albumFavorite);
+        return succeed();
+    }
+
+    @ApiOperation(value = "分页查询")
+    @PostMapping("/list")
+    public Object list(@RequestBody AlbumFavorite albumFavorite) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+
+        int pageNo = albumFavorite.getPageNo();
+        int pageSize = albumFavorite.getPageSize();
+
+        try {
+            if (pageNo==0) {
+                pageNo = 1;
+            }
+            if (pageSize==0) {
+                pageSize = 10;
+            }
+
+            PageHelper.startPage(pageNo,pageSize);
+            return succeed(albumFavoriteService.findList(albumFavorite));
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+}

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

@@ -0,0 +1,100 @@
+package com.yonge.cooleshow.admin.controller;
+
+import javax.validation.Valid;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
+import com.github.pagehelper.PageHelper;
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.biz.dal.entity.AlbumMusicRelate;
+import com.yonge.cooleshow.biz.dal.service.AlbumMusicRelateService;
+
+/**
+ * 专辑曲谱关联表 web 控制层
+ * @author yzp
+ * @date 2022-03-22 16:40:36
+ * @version v1.0
+ **/
+@RestController
+@RequestMapping("/admin/album/relate")
+@Api(tags = "专辑曲谱关联表 web 控制层")
+public class AlbumMusicRelateController extends BaseController {
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
+
+	@Autowired
+	private AlbumMusicRelateService albumMusicRelateService;
+
+	@ApiOperation(value = "新增")
+    @PostMapping("/create")
+    public Object create(@Valid @RequestBody AlbumMusicRelate albumMusicRelate) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+
+        //albumMusicRelate.setCreateBy(sysUser.getId());
+        //albumMusicRelate.setCreateTime(new Date());
+        albumMusicRelateService.insert(albumMusicRelate);
+        return succeed();
+    }
+
+    @ApiOperation(value = "删除")
+    @PostMapping("/delete/{id}")
+    public Object delete(@PathVariable Long id) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+
+        albumMusicRelateService.delete(id);
+        return succeed();
+    }
+
+    @ApiOperation(value = "修改")
+    @PostMapping("/update")
+    public Object update(@Valid @RequestBody AlbumMusicRelate albumMusicRelate) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+        if (albumMusicRelate.getId()==null){
+            return failed("缺少ID");
+        }
+
+        //albumMusicRelate.setUpdateBy(sysUser.getId());
+        //albumMusicRelate.setUpdateTime(new Date());
+        albumMusicRelateService.update(albumMusicRelate);
+        return succeed();
+    }
+
+    @ApiOperation(value = "分页查询")
+    @PostMapping("/list")
+    public Object list(@RequestBody AlbumMusicRelate albumMusicRelate) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+
+        int pageNo = albumMusicRelate.getPageNo();
+        int pageSize = albumMusicRelate.getPageSize();
+
+        try {
+            if (pageNo==0) {
+                pageNo = 1;
+            }
+            if (pageSize==0) {
+                pageSize = 10;
+            }
+
+            PageHelper.startPage(pageNo,pageSize);
+            return succeed(albumMusicRelateService.findList(albumMusicRelate));
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+}

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

@@ -0,0 +1,95 @@
+package com.yonge.cooleshow.admin.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.Date;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.entity.HolidaysFestivals;
+import com.yonge.cooleshow.biz.dal.service.HolidaysFestivalsService;
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.toolset.log.model.AuditLogAnnotation;
+
+@RequestMapping("holidaysFestivals")
+@Api(tags = "节假日")
+@RestController
+public class HolidaysFestivalsController extends BaseController {
+
+	@Autowired
+	private HolidaysFestivalsService holidaysFestivalsService;
+
+	@Autowired
+	private SysUserFeignService sysUserFeignService;
+
+	@ApiOperation("按年查询节假日")
+	@ApiImplicitParam(name = "year", value = "年份", required = false, dataType = "Integer", paramType = "path")
+	@GetMapping(value = "/query/{year}", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	public Object query(@PathVariable("year") Integer year) {
+		
+		HolidaysFestivals originHolidaysFestivals = holidaysFestivalsService.queryByYear(year);
+
+		return succeed(originHolidaysFestivals);
+	}
+
+	@ApiOperation("新增节假日")
+	@ApiImplicitParam(name = "HolidaysFestivals", value = "节假日对象", required = false, dataType = "HolidaysFestivals", paramType = "body")
+	@PostMapping(value = "/add", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	@AuditLogAnnotation(operateName = "新增节假日", interfaceURL = "holidaysFestivals/add")
+	@PreAuthorize("@pcs.hasPermissions('holidaysFestivals/add')")
+	public Object add(@RequestBody HolidaysFestivals holidaysFestivals) {
+		SysUser user = sysUserFeignService.queryUserInfo();
+
+		if (user == null || user.getId() == null) {
+			return failed(HttpStatus.FORBIDDEN, "请登录");
+		}
+
+		if (holidaysFestivals.getYear() == null || holidaysFestivals.getYear() <= 2020) {
+			return failed("参数错误");
+		}
+
+		// 检查是否已经新增
+		HolidaysFestivals originHolidaysFestivals = holidaysFestivalsService.queryByYear(holidaysFestivals.getYear());
+
+		if (originHolidaysFestivals != null) {
+			return failed("该年份已提交，请勿重复提交");
+		}
+
+		Date date = new Date();
+		holidaysFestivals.setCreateTime(date).setCreateBy(user.getId()).setUpdateTime(date).setUpdateBy(user.getId());
+		holidaysFestivalsService.insert(holidaysFestivals);
+		return succeed();
+	}
+
+	@ApiOperation("更新节假日")
+	@ApiImplicitParam(name = "HolidaysFestivals", value = "节假日对象", required = false, dataType = "HolidaysFestivals", paramType = "body")
+	@PostMapping(value = "/update", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	@AuditLogAnnotation(operateName = "更新节假日", interfaceURL = "holidaysFestivals/update")
+	@PreAuthorize("@pcs.hasPermissions('holidaysFestivals/update')")
+	public Object update(HolidaysFestivals holidaysFestivals) {
+		SysUser user = sysUserFeignService.queryUserInfo();
+
+		if (user == null || user.getId() == null) {
+			return failed(HttpStatus.FORBIDDEN, "请登录");
+		}
+
+		Date date = new Date();
+		holidaysFestivals.setUpdateTime(date).setUpdateBy(user.getId());
+
+		holidaysFestivalsService.update(holidaysFestivals);
+		return succeed();
+	}
+}

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

@@ -0,0 +1,100 @@
+package com.yonge.cooleshow.admin.controller;
+
+import javax.validation.Valid;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
+import com.github.pagehelper.PageHelper;
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.biz.dal.entity.MusicAlbum;
+import com.yonge.cooleshow.biz.dal.service.MusicAlbumService;
+
+/**
+ * 专辑表 web 控制层
+ * @author yzp
+ * @date 2022-03-22 16:40:36
+ * @version v1.0
+ **/
+@RestController
+@RequestMapping("/admin/music/album")
+@Api(tags = "专辑表 web 控制层")
+public class MusicAlbumController extends BaseController {
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
+
+	@Autowired
+	private MusicAlbumService musicAlbumService;
+
+	@ApiOperation(value = "新增")
+    @PostMapping("/create")
+    public Object create(@Valid @RequestBody MusicAlbum musicAlbum) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+
+        //musicAlbum.setCreateBy(sysUser.getId());
+        //musicAlbum.setCreateTime(new Date());
+        musicAlbumService.insert(musicAlbum);
+        return succeed();
+    }
+
+    @ApiOperation(value = "删除")
+    @PostMapping("/delete/{id}")
+    public Object delete(@PathVariable Long id) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+
+        musicAlbumService.delete(id);
+        return succeed();
+    }
+
+    @ApiOperation(value = "修改")
+    @PostMapping("/update")
+    public Object update(@Valid @RequestBody MusicAlbum musicAlbum) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+        if (musicAlbum.getId()==null){
+            return failed("缺少ID");
+        }
+
+        //musicAlbum.setUpdateBy(sysUser.getId());
+        //musicAlbum.setUpdateTime(new Date());
+        musicAlbumService.update(musicAlbum);
+        return succeed();
+    }
+
+    @ApiOperation(value = "分页查询")
+    @PostMapping("/list")
+    public Object list(@RequestBody MusicAlbum musicAlbum) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+
+        int pageNo = musicAlbum.getPageNo();
+        int pageSize = musicAlbum.getPageSize();
+
+        try {
+            if (pageNo==0) {
+                pageNo = 1;
+            }
+            if (pageSize==0) {
+                pageSize = 10;
+            }
+
+            PageHelper.startPage(pageNo,pageSize);
+            return succeed(musicAlbumService.findList(musicAlbum));
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+}

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

@@ -0,0 +1,100 @@
+package com.yonge.cooleshow.admin.controller;
+
+import javax.validation.Valid;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
+import com.github.pagehelper.PageHelper;
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.biz.dal.entity.MusicFavorite;
+import com.yonge.cooleshow.biz.dal.service.MusicFavoriteService;
+
+/**
+ * 乐谱收藏表 web 控制层
+ * @author yzp
+ * @date 2022-03-22 16:40:36
+ * @version v1.0
+ **/
+@RestController
+@RequestMapping("/admin/favor/music")
+@Api(tags = "乐谱收藏表 web 控制层")
+public class MusicFavoriteController extends BaseController {
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
+
+	@Autowired
+	private MusicFavoriteService musicFavoriteService;
+
+	@ApiOperation(value = "新增")
+    @PostMapping("/create")
+    public Object create(@Valid @RequestBody MusicFavorite musicFavorite) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+
+        //musicFavorite.setCreateBy(sysUser.getId());
+        //musicFavorite.setCreateTime(new Date());
+        musicFavoriteService.insert(musicFavorite);
+        return succeed();
+    }
+
+    @ApiOperation(value = "删除")
+    @PostMapping("/delete/{id}")
+    public Object delete(@PathVariable Long id) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+
+        musicFavoriteService.delete(id);
+        return succeed();
+    }
+
+    @ApiOperation(value = "修改")
+    @PostMapping("/update")
+    public Object update(@Valid @RequestBody MusicFavorite musicFavorite) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+        if (musicFavorite.getId()==null){
+            return failed("缺少ID");
+        }
+
+        //musicFavorite.setUpdateBy(sysUser.getId());
+        //musicFavorite.setUpdateTime(new Date());
+        musicFavoriteService.update(musicFavorite);
+        return succeed();
+    }
+
+    @ApiOperation(value = "分页查询")
+    @PostMapping("/list")
+    public Object list(@RequestBody MusicFavorite musicFavorite) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+
+        int pageNo = musicFavorite.getPageNo();
+        int pageSize = musicFavorite.getPageSize();
+
+        try {
+            if (pageNo==0) {
+                pageNo = 1;
+            }
+            if (pageSize==0) {
+                pageSize = 10;
+            }
+
+            PageHelper.startPage(pageNo,pageSize);
+            return succeed(musicFavoriteService.findList(musicFavorite));
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+}

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

@@ -0,0 +1,100 @@
+package com.yonge.cooleshow.admin.controller;
+
+import javax.validation.Valid;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
+import com.github.pagehelper.PageHelper;
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.biz.dal.entity.MusicSheetAccompaniment;
+import com.yonge.cooleshow.biz.dal.service.MusicSheetAccompanimentService;
+
+/**
+ * 曲谱伴奏表 web 控制层
+ * @author yzp
+ * @date 2022-03-22 16:40:36
+ * @version v1.0
+ **/
+@RestController
+@RequestMapping("/admin/music/detail")
+@Api(tags = "曲谱伴奏表 web 控制层")
+public class MusicSheetAccompanimentController extends BaseController {
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
+
+	@Autowired
+	private MusicSheetAccompanimentService musicSheetAccompanimentService;
+
+	@ApiOperation(value = "新增")
+    @PostMapping("/create")
+    public Object create(@Valid @RequestBody MusicSheetAccompaniment musicSheetAccompaniment) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+
+        //musicSheetAccompaniment.setCreateBy(sysUser.getId());
+        //musicSheetAccompaniment.setCreateTime(new Date());
+        musicSheetAccompanimentService.insert(musicSheetAccompaniment);
+        return succeed();
+    }
+
+    @ApiOperation(value = "删除")
+    @PostMapping("/delete/{id}")
+    public Object delete(@PathVariable Long id) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+
+        musicSheetAccompanimentService.delete(id);
+        return succeed();
+    }
+
+    @ApiOperation(value = "修改")
+    @PostMapping("/update")
+    public Object update(@Valid @RequestBody MusicSheetAccompaniment musicSheetAccompaniment) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+        if (musicSheetAccompaniment.getId()==null){
+            return failed("缺少ID");
+        }
+
+        //musicSheetAccompaniment.setUpdateBy(sysUser.getId());
+        //musicSheetAccompaniment.setUpdateTime(new Date());
+        musicSheetAccompanimentService.update(musicSheetAccompaniment);
+        return succeed();
+    }
+
+    @ApiOperation(value = "分页查询")
+    @PostMapping("/list")
+    public Object list(@RequestBody MusicSheetAccompaniment musicSheetAccompaniment) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+
+        int pageNo = musicSheetAccompaniment.getPageNo();
+        int pageSize = musicSheetAccompaniment.getPageSize();
+
+        try {
+            if (pageNo==0) {
+                pageNo = 1;
+            }
+            if (pageSize==0) {
+                pageSize = 10;
+            }
+
+            PageHelper.startPage(pageNo,pageSize);
+            return succeed(musicSheetAccompanimentService.findList(musicSheetAccompaniment));
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+}

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

@@ -1,38 +1,102 @@
 package com.yonge.cooleshow.admin.controller;
 
-import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
+import javax.validation.Valid;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
-import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
-import com.yonge.cooleshow.biz.dal.service.MusicSheetService;
-import com.yonge.cooleshow.common.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
+import com.github.pagehelper.PageHelper;
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
+import com.yonge.cooleshow.biz.dal.service.MusicSheetService;
 
+import java.util.Date;
+
+/**
+ * 曲谱表 web 控制层
+ * @author yzp
+ * @date 2022-03-22 16:40:36
+ * @version v1.0
+ **/
 @RestController
-@RequestMapping("/music")
-@Api(tags = "乐谱 web controller")
+@RequestMapping("/admin/music/sheet")
+@Api(tags = "曲谱表 web 控制层")
 public class MusicSheetController extends BaseController {
     @Autowired
     private SysUserFeignService sysUserFeignService;
 
-    @Autowired
-    private MusicSheetService musicSheetService;
+	@Autowired
+	private MusicSheetService musicSheetService;
 
-    @ApiOperation(value = "新增曲谱")
+	@ApiOperation(value = "新增")
     @PostMapping("/create")
-    public Object create(@RequestBody MusicSheet musicSheet) {
+    public Object create(@Valid @RequestBody MusicSheet musicSheet) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
 
-        musicSheet.setCreateBy(0L);
-        musicSheetService.save(musicSheet);
+        musicSheet.setCreateBy(sysUser.getId());
+        musicSheet.setCreateTime(new Date());
+        musicSheetService.insert(musicSheet);
         return succeed();
     }
+
+    @ApiOperation(value = "删除")
+    @PostMapping("/delete/{id}")
+    public Object delete(@PathVariable Long id) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+
+        musicSheetService.delete(id);
+        return succeed();
+    }
+
+    @ApiOperation(value = "修改")
+    @PostMapping("/update")
+    public Object update(@Valid @RequestBody MusicSheet musicSheet) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+        if (musicSheet.getId()==null){
+            return failed("缺少ID");
+        }
+
+        //musicSheet.setUpdateBy(sysUser.getId());
+        //musicSheet.setUpdateTime(new Date());
+        musicSheetService.update(musicSheet);
+        return succeed();
+    }
+
+    @ApiOperation(value = "分页查询")
+    @PostMapping("/list")
+    public Object list(@RequestBody MusicSheet musicSheet) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+
+        int pageNo = musicSheet.getPageNo();
+        int pageSize = musicSheet.getPageSize();
+
+        try {
+            if (pageNo==0) {
+                pageNo = 1;
+            }
+            if (pageSize==0) {
+                pageSize = 10;
+            }
+
+            PageHelper.startPage(pageNo,pageSize);
+            return succeed(musicSheetService.findList(musicSheet));
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
 }

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

@@ -0,0 +1,100 @@
+package com.yonge.cooleshow.admin.controller;
+
+import javax.validation.Valid;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
+import com.github.pagehelper.PageHelper;
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.biz.dal.entity.MusicSheetPurchaseRecord;
+import com.yonge.cooleshow.biz.dal.service.MusicSheetPurchaseRecordService;
+
+/**
+ * 曲谱购买记录表 web 控制层
+ * @author yzp
+ * @date 2022-03-22 16:40:36
+ * @version v1.0
+ **/
+@RestController
+@RequestMapping("/admin/music/buy/record")
+@Api(tags = "曲谱购买记录表 web 控制层")
+public class MusicSheetPurchaseRecordController extends BaseController {
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
+
+	@Autowired
+	private MusicSheetPurchaseRecordService musicSheetPurchaseRecordService;
+
+	@ApiOperation(value = "新增")
+    @PostMapping("/create")
+    public Object create(@Valid @RequestBody MusicSheetPurchaseRecord musicSheetPurchaseRecord) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+
+        //musicSheetPurchaseRecord.setCreateBy(sysUser.getId());
+        //musicSheetPurchaseRecord.setCreateTime(new Date());
+        musicSheetPurchaseRecordService.insert(musicSheetPurchaseRecord);
+        return succeed();
+    }
+
+    @ApiOperation(value = "删除")
+    @PostMapping("/delete/{id}")
+    public Object delete(@PathVariable Long id) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+
+        musicSheetPurchaseRecordService.delete(id);
+        return succeed();
+    }
+
+    @ApiOperation(value = "修改")
+    @PostMapping("/update")
+    public Object update(@Valid @RequestBody MusicSheetPurchaseRecord musicSheetPurchaseRecord) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+        if (musicSheetPurchaseRecord.getId()==null){
+            return failed("缺少ID");
+        }
+
+        //musicSheetPurchaseRecord.setUpdateBy(sysUser.getId());
+        //musicSheetPurchaseRecord.setUpdateTime(new Date());
+        musicSheetPurchaseRecordService.update(musicSheetPurchaseRecord);
+        return succeed();
+    }
+
+    @ApiOperation(value = "分页查询")
+    @PostMapping("/list")
+    public Object list(@RequestBody MusicSheetPurchaseRecord musicSheetPurchaseRecord) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+
+        int pageNo = musicSheetPurchaseRecord.getPageNo();
+        int pageSize = musicSheetPurchaseRecord.getPageSize();
+
+        try {
+            if (pageNo==0) {
+                pageNo = 1;
+            }
+            if (pageSize==0) {
+                pageSize = 10;
+            }
+
+            PageHelper.startPage(pageNo,pageSize);
+            return succeed(musicSheetPurchaseRecordService.findList(musicSheetPurchaseRecord));
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+}

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

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dto.req.AuthOperaReq;
-import com.yonge.cooleshow.biz.dal.dto.search.TeacherAuthEntryRecordSearch;
+import com.yonge.cooleshow.biz.dal.dto.search.AuthEntryRecordSearch;
 import com.yonge.cooleshow.biz.dal.service.TeacherAuthEntryRecordService;
 import com.yonge.cooleshow.biz.dal.support.Condition;
 import com.yonge.cooleshow.biz.dal.support.Query;
@@ -35,7 +35,7 @@ public class TeacherAuthEntryRecordController extends BaseController {
      */
     @GetMapping("/page")
     @ApiOperation(value = "查询分页", notes = "传入teacherAuthEntryRecord")
-    public HttpResponseResult<PageInfo<TeacherAuthEntryRecordVo>> page(TeacherAuthEntryRecordSearch search, Query query) {
+    public HttpResponseResult<PageInfo<TeacherAuthEntryRecordVo>> page(AuthEntryRecordSearch search, Query query) {
         IPage<TeacherAuthEntryRecordVo> pages = teacherAuthEntryRecordService.selectPage(Condition.getPage(query), search);
         return succeed(Condition.pageInfo(pages));
     }

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

@@ -0,0 +1,75 @@
+package com.yonge.cooleshow.admin.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.dto.req.AuthOperaReq;
+import com.yonge.cooleshow.biz.dal.dto.search.AuthEntryRecordSearch;
+import com.yonge.cooleshow.biz.dal.entity.TeacherAuthMusicianRecord;
+import com.yonge.cooleshow.biz.dal.service.TeacherAuthMusicianRecordService;
+import com.yonge.cooleshow.biz.dal.support.Condition;
+import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.biz.dal.vo.MusicianAuthEntryRecordVo;
+import com.yonge.cooleshow.biz.dal.vo.TeacherAuthEntryRecordVo;
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.cooleshow.common.page.PageInfo;
+import com.yonge.toolset.utils.string.StringUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+@RestController
+@RequestMapping("/TeacherAuthMusicianRecord")
+@Api(value = "老师音乐人审核表", tags = "老师音乐人审核表")
+public class TeacherAuthMusicianRecordController extends BaseController {
+
+    @Autowired
+    private TeacherAuthMusicianRecordService teacherAuthMusicianRecordService;
+	@Autowired
+	private SysUserFeignService sysUserFeignService;
+
+	/**
+	 * 查询分页
+	 */
+	@GetMapping("/page")
+	@ApiOperation(value = "查询分页", notes = "传入AuthEntryRecordSearch")
+	public HttpResponseResult<PageInfo<MusicianAuthEntryRecordVo>> page(AuthEntryRecordSearch search, Query query) {
+		IPage<MusicianAuthEntryRecordVo> pages = teacherAuthMusicianRecordService.selectPage(Condition.getPage(query), search);
+		return succeed(Condition.pageInfo(pages));
+	}
+
+	/**
+	 * 查询单条详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperation(value = "详情", notes = "传入teacherAuthEntryRecord")
+	public HttpResponseResult<MusicianAuthEntryRecordVo> detail(@ApiParam(value = "主键", required = true) @RequestParam Long id) {
+		MusicianAuthEntryRecordVo detail = teacherAuthMusicianRecordService.detail(id);
+		return succeed(detail);
+	}
+
+	@PostMapping("/doAuth")
+	@ApiOperation(value = "审核", notes = "传入authOperaDto")
+	public HttpResponseResult<Boolean> doAuth(@Valid @RequestBody AuthOperaReq authOperaReq) throws Exception {
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		return teacherAuthMusicianRecordService.doAuth(authOperaReq, sysUser);
+	}
+
+ 	/**
+	 * 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public HttpResponseResult remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+        if (StringUtil.isEmpty(ids)) {
+			return failed("参数不能为空");
+		}
+		return status(teacherAuthMusicianRecordService.removeByIds(StringUtil.toLongList(ids)));
+	}
+}

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

@@ -0,0 +1,100 @@
+package com.yonge.cooleshow.admin.controller;
+
+import javax.validation.Valid;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
+import com.github.pagehelper.PageHelper;
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.biz.dal.entity.VideoLessonEvaluate;
+import com.yonge.cooleshow.biz.dal.service.VideoLessonEvaluateService;
+
+/**
+ * 视频课学员评价 web 控制层
+ * @author yzp
+ * @date 2022-03-22 16:40:36
+ * @version v1.0
+ **/
+@RestController
+@RequestMapping("/admin/videolesson/evaluate")
+@Api(tags = "视频课学员评价 web 控制层")
+public class VideoLessonEvaluateController extends BaseController {
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
+
+	@Autowired
+	private VideoLessonEvaluateService videoLessonEvaluateService;
+
+	@ApiOperation(value = "新增")
+    @PostMapping("/create")
+    public Object create(@Valid @RequestBody VideoLessonEvaluate videoLessonEvaluate) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+
+        //videoLessonEvaluate.setCreateBy(sysUser.getId());
+        //videoLessonEvaluate.setCreateTime(new Date());
+        videoLessonEvaluateService.insert(videoLessonEvaluate);
+        return succeed();
+    }
+
+    @ApiOperation(value = "删除")
+    @PostMapping("/delete/{id}")
+    public Object delete(@PathVariable Long id) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+
+        videoLessonEvaluateService.delete(id);
+        return succeed();
+    }
+
+    @ApiOperation(value = "修改")
+    @PostMapping("/update")
+    public Object update(@Valid @RequestBody VideoLessonEvaluate videoLessonEvaluate) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+        if (videoLessonEvaluate.getId()==null){
+            return failed("缺少ID");
+        }
+
+        //videoLessonEvaluate.setUpdateBy(sysUser.getId());
+        //videoLessonEvaluate.setUpdateTime(new Date());
+        videoLessonEvaluateService.update(videoLessonEvaluate);
+        return succeed();
+    }
+
+    @ApiOperation(value = "分页查询")
+    @PostMapping("/list")
+    public Object list(@RequestBody VideoLessonEvaluate videoLessonEvaluate) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+
+        int pageNo = videoLessonEvaluate.getPageNo();
+        int pageSize = videoLessonEvaluate.getPageSize();
+
+        try {
+            if (pageNo==0) {
+                pageNo = 1;
+            }
+            if (pageSize==0) {
+                pageSize = 10;
+            }
+
+            PageHelper.startPage(pageNo,pageSize);
+            return succeed(videoLessonEvaluateService.findList(videoLessonEvaluate));
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+}

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

@@ -0,0 +1,100 @@
+package com.yonge.cooleshow.admin.controller;
+
+import javax.validation.Valid;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
+import com.github.pagehelper.PageHelper;
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.biz.dal.entity.VideoLessonGroup;
+import com.yonge.cooleshow.biz.dal.service.VideoLessonGroupService;
+
+/**
+ * 视频课基本信息表 web 控制层
+ * @author yzp
+ * @date 2022-03-22 16:40:36
+ * @version v1.0
+ **/
+@RestController
+@RequestMapping("/admin/videolesson/group")
+@Api(tags = "视频课基本信息表 web 控制层")
+public class VideoLessonGroupController extends BaseController {
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
+
+	@Autowired
+	private VideoLessonGroupService videoLessonGroupService;
+
+	@ApiOperation(value = "新增")
+    @PostMapping("/create")
+    public Object create(@Valid @RequestBody VideoLessonGroup videoLessonGroup) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+
+        //videoLessonGroup.setCreateBy(sysUser.getId());
+        //videoLessonGroup.setCreateTime(new Date());
+        videoLessonGroupService.insert(videoLessonGroup);
+        return succeed();
+    }
+
+    @ApiOperation(value = "删除")
+    @PostMapping("/delete/{id}")
+    public Object delete(@PathVariable Long id) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+
+        videoLessonGroupService.delete(id);
+        return succeed();
+    }
+
+    @ApiOperation(value = "修改")
+    @PostMapping("/update")
+    public Object update(@Valid @RequestBody VideoLessonGroup videoLessonGroup) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+        if (videoLessonGroup.getId()==null){
+            return failed("缺少ID");
+        }
+
+        //videoLessonGroup.setUpdateBy(sysUser.getId());
+        //videoLessonGroup.setUpdateTime(new Date());
+        videoLessonGroupService.update(videoLessonGroup);
+        return succeed();
+    }
+
+    @ApiOperation(value = "分页查询")
+    @PostMapping("/list")
+    public Object list(@RequestBody VideoLessonGroup videoLessonGroup) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+
+        int pageNo = videoLessonGroup.getPageNo();
+        int pageSize = videoLessonGroup.getPageSize();
+
+        try {
+            if (pageNo==0) {
+                pageNo = 1;
+            }
+            if (pageSize==0) {
+                pageSize = 10;
+            }
+
+            PageHelper.startPage(pageNo,pageSize);
+            return succeed(videoLessonGroupService.findList(videoLessonGroup));
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+}

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

@@ -0,0 +1,100 @@
+package com.yonge.cooleshow.admin.controller;
+
+import javax.validation.Valid;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
+import com.github.pagehelper.PageHelper;
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.biz.dal.entity.VideoLessonGroupDetail;
+import com.yonge.cooleshow.biz.dal.service.VideoLessonGroupDetailService;
+
+/**
+ * 视频课明细表 web 控制层
+ * @author yzp
+ * @date 2022-03-22 16:40:36
+ * @version v1.0
+ **/
+@RestController
+@RequestMapping("/admin/videolesson/group/detail")
+@Api(tags = "视频课明细表 web 控制层")
+public class VideoLessonGroupDetailController extends BaseController {
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
+
+	@Autowired
+	private VideoLessonGroupDetailService videoLessonGroupDetailService;
+
+	@ApiOperation(value = "新增")
+    @PostMapping("/create")
+    public Object create(@Valid @RequestBody VideoLessonGroupDetail videoLessonGroupDetail) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+
+        //videoLessonGroupDetail.setCreateBy(sysUser.getId());
+        //videoLessonGroupDetail.setCreateTime(new Date());
+        videoLessonGroupDetailService.insert(videoLessonGroupDetail);
+        return succeed();
+    }
+
+    @ApiOperation(value = "删除")
+    @PostMapping("/delete/{id}")
+    public Object delete(@PathVariable Long id) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+
+        videoLessonGroupDetailService.delete(id);
+        return succeed();
+    }
+
+    @ApiOperation(value = "修改")
+    @PostMapping("/update")
+    public Object update(@Valid @RequestBody VideoLessonGroupDetail videoLessonGroupDetail) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+        if (videoLessonGroupDetail.getId()==null){
+            return failed("缺少ID");
+        }
+
+        //videoLessonGroupDetail.setUpdateBy(sysUser.getId());
+        //videoLessonGroupDetail.setUpdateTime(new Date());
+        videoLessonGroupDetailService.update(videoLessonGroupDetail);
+        return succeed();
+    }
+
+    @ApiOperation(value = "分页查询")
+    @PostMapping("/list")
+    public Object list(@RequestBody VideoLessonGroupDetail videoLessonGroupDetail) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+
+        int pageNo = videoLessonGroupDetail.getPageNo();
+        int pageSize = videoLessonGroupDetail.getPageSize();
+
+        try {
+            if (pageNo==0) {
+                pageNo = 1;
+            }
+            if (pageSize==0) {
+                pageSize = 10;
+            }
+
+            PageHelper.startPage(pageNo,pageSize);
+            return succeed(videoLessonGroupDetailService.findList(videoLessonGroupDetail));
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+}

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

@@ -0,0 +1,100 @@
+package com.yonge.cooleshow.admin.controller;
+
+import javax.validation.Valid;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
+import com.github.pagehelper.PageHelper;
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.biz.dal.entity.VideoLessonPurchaseRecord;
+import com.yonge.cooleshow.biz.dal.service.VideoLessonPurchaseRecordService;
+
+/**
+ * 视频课购买记录表 web 控制层
+ * @author yzp
+ * @date 2022-03-22 16:40:36
+ * @version v1.0
+ **/
+@RestController
+@RequestMapping("/admin/videolesson/buy/record")
+@Api(tags = "视频课购买记录表 web 控制层")
+public class VideoLessonPurchaseRecordController extends BaseController {
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
+
+	@Autowired
+	private VideoLessonPurchaseRecordService videoLessonPurchaseRecordService;
+
+	@ApiOperation(value = "新增")
+    @PostMapping("/create")
+    public Object create(@Valid @RequestBody VideoLessonPurchaseRecord videoLessonPurchaseRecord) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+
+        //videoLessonPurchaseRecord.setCreateBy(sysUser.getId());
+        //videoLessonPurchaseRecord.setCreateTime(new Date());
+        videoLessonPurchaseRecordService.insert(videoLessonPurchaseRecord);
+        return succeed();
+    }
+
+    @ApiOperation(value = "删除")
+    @PostMapping("/delete/{id}")
+    public Object delete(@PathVariable Long id) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+
+        videoLessonPurchaseRecordService.delete(id);
+        return succeed();
+    }
+
+    @ApiOperation(value = "修改")
+    @PostMapping("/update")
+    public Object update(@Valid @RequestBody VideoLessonPurchaseRecord videoLessonPurchaseRecord) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+        if (videoLessonPurchaseRecord.getId()==null){
+            return failed("缺少ID");
+        }
+
+        //videoLessonPurchaseRecord.setUpdateBy(sysUser.getId());
+        //videoLessonPurchaseRecord.setUpdateTime(new Date());
+        videoLessonPurchaseRecordService.update(videoLessonPurchaseRecord);
+        return succeed();
+    }
+
+    @ApiOperation(value = "分页查询")
+    @PostMapping("/list")
+    public Object list(@RequestBody VideoLessonPurchaseRecord videoLessonPurchaseRecord) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+
+        int pageNo = videoLessonPurchaseRecord.getPageNo();
+        int pageSize = videoLessonPurchaseRecord.getPageSize();
+
+        try {
+            if (pageNo==0) {
+                pageNo = 1;
+            }
+            if (pageSize==0) {
+                pageSize = 10;
+            }
+
+            PageHelper.startPage(pageNo,pageSize);
+            return succeed(videoLessonPurchaseRecordService.findList(videoLessonPurchaseRecord));
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+}

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

@@ -0,0 +1,100 @@
+package com.yonge.cooleshow.admin.controller;
+
+import javax.validation.Valid;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
+import com.github.pagehelper.PageHelper;
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.biz.dal.entity.VideoLessonStudyRecord;
+import com.yonge.cooleshow.biz.dal.service.VideoLessonStudyRecordService;
+
+/**
+ * 视频课学习记录表 web 控制层
+ * @author yzp
+ * @date 2022-03-22 16:40:36
+ * @version v1.0
+ **/
+@RestController
+@RequestMapping("/admin/videolesson/study/record")
+@Api(tags = "视频课学习记录表 web 控制层")
+public class VideoLessonStudyRecordController extends BaseController {
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
+
+	@Autowired
+	private VideoLessonStudyRecordService videoLessonStudyRecordService;
+
+	@ApiOperation(value = "新增")
+    @PostMapping("/create")
+    public Object create(@Valid @RequestBody VideoLessonStudyRecord videoLessonStudyRecord) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+
+        //videoLessonStudyRecord.setCreateBy(sysUser.getId());
+        //videoLessonStudyRecord.setCreateTime(new Date());
+        videoLessonStudyRecordService.insert(videoLessonStudyRecord);
+        return succeed();
+    }
+
+    @ApiOperation(value = "删除")
+    @PostMapping("/delete/{id}")
+    public Object delete(@PathVariable Long id) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+
+        videoLessonStudyRecordService.delete(id);
+        return succeed();
+    }
+
+    @ApiOperation(value = "修改")
+    @PostMapping("/update")
+    public Object update(@Valid @RequestBody VideoLessonStudyRecord videoLessonStudyRecord) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+        if (videoLessonStudyRecord.getId()==null){
+            return failed("缺少ID");
+        }
+
+        //videoLessonStudyRecord.setUpdateBy(sysUser.getId());
+        //videoLessonStudyRecord.setUpdateTime(new Date());
+        videoLessonStudyRecordService.update(videoLessonStudyRecord);
+        return succeed();
+    }
+
+    @ApiOperation(value = "分页查询")
+    @PostMapping("/list")
+    public Object list(@RequestBody VideoLessonStudyRecord videoLessonStudyRecord) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+
+        int pageNo = videoLessonStudyRecord.getPageNo();
+        int pageSize = videoLessonStudyRecord.getPageSize();
+
+        try {
+            if (pageNo==0) {
+                pageNo = 1;
+            }
+            if (pageSize==0) {
+                pageSize = 10;
+            }
+
+            PageHelper.startPage(pageNo,pageSize);
+            return succeed(videoLessonStudyRecordService.findList(videoLessonStudyRecord));
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+}

cooleshow-user/user-admin/src/main/resources/bootstrap-dev.yml

@@ -10,3 +10,4 @@ spring:
         refresh:
           enabled: true
         enabled: true
+

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

@@ -1,16 +1,16 @@
 package com.yonge.cooleshow.biz.dal.dao;
 
-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;
+import com.yonge.cooleshow.common.dal.BaseDAO;
+import org.apache.ibatis.annotations.Mapper;
 
-public interface AlbumFavoriteDao extends BaseMapper<AlbumFavorite>{
+/**
+ * AlbumFavoriteDao数据库访问类
+ * @author yzp
+ * @date 2022-03-22 16:07:40
+ * @version v1.0
+ **/
+@Mapper
+public interface AlbumFavoriteDao extends BaseDAO<Long, AlbumFavorite> {
 
-	/**
-	 * 自定义分页
-	 */
-	List<AlbumFavorite> selectPage(IPage page, AlbumFavorite albumFavorite);
-	
 }

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

@@ -1,16 +1,16 @@
 package com.yonge.cooleshow.biz.dal.dao;
 
-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;
+import com.yonge.cooleshow.common.dal.BaseDAO;
+import org.apache.ibatis.annotations.Mapper;
 
-public interface AlbumMusicRelateDao extends BaseMapper<AlbumMusicRelate>{
+/**
+ * AlbumMusicRelateDao数据库访问类
+ * @author yzp
+ * @date 2022-03-22 16:07:40
+ * @version v1.0
+ **/
+@Mapper
+public interface AlbumMusicRelateDao extends BaseDAO<Long, AlbumMusicRelate> {
 
-	/**
-	 * 自定义分页
-	 */
-	List<AlbumMusicRelate> selectPage(IPage page, AlbumMusicRelate albumMusicRelate);
-	
 }

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

@@ -0,0 +1,10 @@
+package com.yonge.cooleshow.biz.dal.dao;
+
+import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.cooleshow.biz.dal.entity.HolidaysFestivals;
+
+public interface HolidaysFestivalsDao extends BaseDAO<Integer, HolidaysFestivals> {
+
+	HolidaysFestivals queryByYear(int year);
+	
+}

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

@@ -1,16 +1,16 @@
 package com.yonge.cooleshow.biz.dal.dao;
 
-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;
+import com.yonge.cooleshow.common.dal.BaseDAO;
+import org.apache.ibatis.annotations.Mapper;
 
-public interface MusicAlbumDao extends BaseMapper<MusicAlbum>{
+/**
+ * MusicAlbumDao数据库访问类
+ * @author yzp
+ * @date 2022-03-22 16:07:40
+ * @version v1.0
+ **/
+@Mapper
+public interface MusicAlbumDao extends BaseDAO<Long, MusicAlbum> {
 
-	/**
-	 * 自定义分页
-	 */
-	List<MusicAlbum> selectPage(IPage page, MusicAlbum musicAlbum);
-	
 }

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

@@ -1,16 +1,16 @@
 package com.yonge.cooleshow.biz.dal.dao;
 
-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;
+import com.yonge.cooleshow.common.dal.BaseDAO;
+import org.apache.ibatis.annotations.Mapper;
 
-public interface MusicFavoriteDao extends BaseMapper<MusicFavorite>{
+/**
+ * MusicFavoriteDao数据库访问类
+ * @author yzp
+ * @date 2022-03-22 16:07:40
+ * @version v1.0
+ **/
+@Mapper
+public interface MusicFavoriteDao extends BaseDAO<Long, MusicFavorite> {
 
-	/**
-	 * 自定义分页
-	 */
-	List<MusicFavorite> selectPage(IPage page, MusicFavorite musicFavorite);
-	
 }

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

@@ -1,16 +1,16 @@
 package com.yonge.cooleshow.biz.dal.dao;
 
-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;
+import com.yonge.cooleshow.common.dal.BaseDAO;
+import org.apache.ibatis.annotations.Mapper;
 
-public interface MusicSheetAccompanimentDao extends BaseMapper<MusicSheetAccompaniment>{
+/**
+ * MusicSheetAccompanimentDao数据库访问类
+ * @author yzp
+ * @date 2022-03-22 16:07:40
+ * @version v1.0
+ **/
+@Mapper
+public interface MusicSheetAccompanimentDao extends BaseDAO<Long, MusicSheetAccompaniment> {
 
-	/**
-	 * 自定义分页
-	 */
-	List<MusicSheetAccompaniment> selectPage(IPage page, MusicSheetAccompaniment musicSheetAccompaniment);
-	
 }

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

@@ -1,16 +1,16 @@
 package com.yonge.cooleshow.biz.dal.dao;
 
-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;
+import com.yonge.cooleshow.common.dal.BaseDAO;
+import org.apache.ibatis.annotations.Mapper;
 
-public interface MusicSheetDao extends BaseMapper<MusicSheet>{
+/**
+ * MusicSheetDao数据库访问类
+ * @author yzp
+ * @date 2022-03-22 16:07:40
+ * @version v1.0
+ **/
+@Mapper
+public interface MusicSheetDao extends BaseDAO<Long, MusicSheet> {
 
-	/**
-	 * 自定义分页
-	 */
-	List<MusicSheet> selectPage(IPage page, MusicSheet musicSheet);
-	
 }

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

@@ -1,16 +1,16 @@
 package com.yonge.cooleshow.biz.dal.dao;
 
-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;
+import com.yonge.cooleshow.common.dal.BaseDAO;
+import org.apache.ibatis.annotations.Mapper;
 
-public interface MusicSheetPurchaseRecordDao extends BaseMapper<MusicSheetPurchaseRecord>{
+/**
+ * MusicSheetPurchaseRecordDao数据库访问类
+ * @author yzp
+ * @date 2022-03-22 16:07:40
+ * @version v1.0
+ **/
+@Mapper
+public interface MusicSheetPurchaseRecordDao extends BaseDAO<Long, MusicSheetPurchaseRecord> {
 
-	/**
-	 * 自定义分页
-	 */
-	List<MusicSheetPurchaseRecord> selectPage(IPage page, MusicSheetPurchaseRecord musicSheetPurchaseRecord);
-	
 }

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

@@ -5,7 +5,7 @@ import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.biz.dal.dto.req.TeacherApplyDetailReq;
-import com.yonge.cooleshow.biz.dal.dto.search.TeacherAuthEntryRecordSearch;
+import com.yonge.cooleshow.biz.dal.dto.search.AuthEntryRecordSearch;
 import com.yonge.cooleshow.biz.dal.entity.TeacherAuthEntryRecord;
 import com.yonge.cooleshow.biz.dal.vo.TeacherAuthEntryRecordVo;
 import org.apache.ibatis.annotations.Param;
@@ -15,7 +15,7 @@ public interface TeacherAuthEntryRecordDao extends BaseMapper<TeacherAuthEntryRe
 	/**
 	 * 自定义分页
 	 */
-	List<TeacherAuthEntryRecordVo> selectPage(IPage page,@Param("param") TeacherAuthEntryRecordSearch search);
+	List<TeacherAuthEntryRecordVo> selectPage(IPage page,@Param("param") AuthEntryRecordSearch search);
 
 	/***
 	 * 修改用户实名信息

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

@@ -4,13 +4,29 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yonge.cooleshow.biz.dal.dto.search.AuthEntryRecordSearch;
 import com.yonge.cooleshow.biz.dal.entity.TeacherAuthMusicianRecord;
+import com.yonge.cooleshow.biz.dal.vo.MusicianAuthEntryRecordVo;
+import org.apache.ibatis.annotations.Param;
 
 public interface TeacherAuthMusicianRecordDao extends BaseMapper<TeacherAuthMusicianRecord>{
 
-	/**
-	 * 自定义分页
+	/***
+	 * 音乐人审批页面查询
+	 * @author liweifan
+	 * @param: page
+	 * @param: authEntryRecordSearch
+	 * @updateTime 2022/3/22 19:58
+	 * @return: java.util.List<com.yonge.cooleshow.biz.dal.vo.MusicianAuthEntryRecordVo>
 	 */
-	List<TeacherAuthMusicianRecord> selectPage(IPage page, TeacherAuthMusicianRecord teacherAuthMusicianRecord);
-	
+	List<MusicianAuthEntryRecordVo> selectPage(IPage page, AuthEntryRecordSearch authEntryRecordSearch);
+
+	/***
+	 * 审批详情
+	 * @author liweifan
+	 * @param: id
+	 * @updateTime 2022/3/22 19:58
+	 * @return: com.yonge.cooleshow.biz.dal.vo.MusicianAuthEntryRecordVo
+	 */
+	MusicianAuthEntryRecordVo detail(@Param("id") Long id);
 }

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

@@ -1,16 +1,16 @@
 package com.yonge.cooleshow.biz.dal.dao;
 
-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;
+import com.yonge.cooleshow.common.dal.BaseDAO;
+import org.apache.ibatis.annotations.Mapper;
 
-public interface VideoLessonEvaluateDao extends BaseMapper<VideoLessonEvaluate>{
+/**
+ * VideoLessonEvaluateDao数据库访问类
+ * @author yzp
+ * @date 2022-03-22 16:07:40
+ * @version v1.0
+ **/
+@Mapper
+public interface VideoLessonEvaluateDao extends BaseDAO<Long, VideoLessonEvaluate> {
 
-	/**
-	 * 自定义分页
-	 */
-	List<VideoLessonEvaluate> selectPage(IPage page, VideoLessonEvaluate videoLessonEvaluate);
-	
 }

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

@@ -1,16 +1,16 @@
 package com.yonge.cooleshow.biz.dal.dao;
 
-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;
+import com.yonge.cooleshow.common.dal.BaseDAO;
+import org.apache.ibatis.annotations.Mapper;
 
-public interface VideoLessonGroupDao extends BaseMapper<VideoLessonGroup>{
+/**
+ * VideoLessonGroupDao数据库访问类
+ * @author yzp
+ * @date 2022-03-22 16:07:40
+ * @version v1.0
+ **/
+@Mapper
+public interface VideoLessonGroupDao extends BaseDAO<Long, VideoLessonGroup> {
 
-	/**
-	 * 自定义分页
-	 */
-	List<VideoLessonGroup> selectPage(IPage page, VideoLessonGroup videoLessonGroup);
-	
 }

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

@@ -1,16 +1,16 @@
 package com.yonge.cooleshow.biz.dal.dao;
 
-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;
+import com.yonge.cooleshow.common.dal.BaseDAO;
+import org.apache.ibatis.annotations.Mapper;
 
-public interface VideoLessonGroupDetailDao extends BaseMapper<VideoLessonGroupDetail>{
+/**
+ * VideoLessonGroupDetailDao数据库访问类
+ * @author yzp
+ * @date 2022-03-22 16:07:41
+ * @version v1.0
+ **/
+@Mapper
+public interface VideoLessonGroupDetailDao extends BaseDAO<Long, VideoLessonGroupDetail> {
 
-	/**
-	 * 自定义分页
-	 */
-	List<VideoLessonGroupDetail> selectPage(IPage page, VideoLessonGroupDetail videoLessonGroupDetail);
-	
 }

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

@@ -1,16 +1,16 @@
 package com.yonge.cooleshow.biz.dal.dao;
 
-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;
+import com.yonge.cooleshow.common.dal.BaseDAO;
+import org.apache.ibatis.annotations.Mapper;
 
-public interface VideoLessonPurchaseRecordDao extends BaseMapper<VideoLessonPurchaseRecord>{
+/**
+ * VideoLessonPurchaseRecordDao数据库访问类
+ * @author yzp
+ * @date 2022-03-22 16:07:41
+ * @version v1.0
+ **/
+@Mapper
+public interface VideoLessonPurchaseRecordDao extends BaseDAO<Long, VideoLessonPurchaseRecord> {
 
-	/**
-	 * 自定义分页
-	 */
-	List<VideoLessonPurchaseRecord> selectPage(IPage page, VideoLessonPurchaseRecord videoLessonPurchaseRecord);
-	
 }

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

@@ -1,16 +1,16 @@
 package com.yonge.cooleshow.biz.dal.dao;
 
-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;
+import com.yonge.cooleshow.common.dal.BaseDAO;
+import org.apache.ibatis.annotations.Mapper;
 
-public interface VideoLessonStudyRecordDao extends BaseMapper<VideoLessonStudyRecord>{
+/**
+ * VideoLessonStudyRecordDao数据库访问类
+ * @author yzp
+ * @date 2022-03-22 16:07:41
+ * @version v1.0
+ **/
+@Mapper
+public interface VideoLessonStudyRecordDao extends BaseDAO<Long, VideoLessonStudyRecord> {
 
-	/**
-	 * 自定义分页
-	 */
-	List<VideoLessonStudyRecord> selectPage(IPage page, VideoLessonStudyRecord videoLessonStudyRecord);
-	
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/TeacherAuthEntryRecordSearch.java → cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/AuthEntryRecordSearch.java

@@ -11,8 +11,8 @@ import java.util.Date;
  * @Author: liweifan
  * @Data: 2022/3/21 15:26
  */
-@ApiModel(value = "TeacherAuthEntryRecordSearch", description = "老师入驻审核列表查询")
-public class TeacherAuthEntryRecordSearch {
+@ApiModel(value = "AuthEntryRecordSearch", description = "审核列表查询")
+public class AuthEntryRecordSearch {
     @ApiModelProperty(value = "老师编号/名称/电话")
     private String search;
     @ApiModelProperty(value = "审批人")
@@ -25,8 +25,8 @@ public class TeacherAuthEntryRecordSearch {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date endTime;
-    @ApiModelProperty(value = "老师认证审核状态  1、审核中 2、通过 3、不通过")
-    private Integer teacherAuthStatus;
+    @ApiModelProperty(value = "审核状态  1、审核中 2、通过 3、不通过")
+    private Integer authStatus;
 
     public String getSearch() {
         return search;
@@ -60,11 +60,11 @@ public class TeacherAuthEntryRecordSearch {
         this.endTime = endTime;
     }
 
-    public Integer getTeacherAuthStatus() {
-        return teacherAuthStatus;
+    public Integer getAuthStatus() {
+        return authStatus;
     }
 
-    public void setTeacherAuthStatus(Integer teacherAuthStatus) {
-        this.teacherAuthStatus = teacherAuthStatus;
+    public void setAuthStatus(Integer authStatus) {
+        this.authStatus = authStatus;
     }
 }

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

@@ -1,103 +1,116 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.yonge.cooleshow.common.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 专辑收藏表
- */
-@TableName("album_favorite")
-@ApiModel(value = "AlbumFavorite对象", description = "专辑收藏表")
-public class AlbumFavorite implements Serializable {
-	private static final long serialVersionUID = 1L;
-    /** 
-    * 主键 
-    */
-    @ApiModelProperty("主键 ")
+ * @author yzp
+ * @date 2022-03-22 17:55:56
+ * @version v1.0
+ **/
+@ApiModel(value = "album_favorite-专辑收藏表")
+public class AlbumFavorite extends BaseEntity {
+
     @TableId(value = "id_", type = IdType.AUTO)
-    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;
-
-    public Long getId() {
-        return id;
-    }
+    @ApiModelProperty(value = "主键id")
+    private Long id;  //主键ID
 
-    public void setId(Long id) {
-        this.id = id;
-    }
+    @TableField("user_id_")
+    @ApiModelProperty(value = "用户ID(目前只是学生ID)")
+    private Long userId;  //用户ID(目前只是学生ID)
 
-    public Long getUserId() {
-        return userId;
-    }
+    @TableField("album_id_")
+    @ApiModelProperty(value = "专辑ID")
+    private Long albumId;  //专辑ID
+
+    @TableField("favorite_time_")
+    @ApiModelProperty(value = "收藏时间")
+    private Date favoriteTime;  //收藏时间
+
+    @TableField("favorite_flag_")
+    @ApiModelProperty(value = "是否收藏")
+    private Integer favoriteFlag;  //是否收藏
 
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
 
-    public Long getAlbumId() {
-        return albumId;
+	public AlbumFavorite setId(Long id) {
+	    this.id = id;
+	    return this;
+	}
+
+	public Long getId() {
+	    return this.id;
+	}
+	public AlbumFavorite setUserId(Long userId) {
+	    this.userId = userId;
+	    return this;
+	}
+
+	public Long getUserId() {
+	    return this.userId;
+	}
+	public AlbumFavorite setAlbumId(Long albumId) {
+	    this.albumId = albumId;
+	    return this;
+	}
+
+	public Long getAlbumId() {
+	    return this.albumId;
+	}
+	public AlbumFavorite setFavoriteTime(Date favoriteTime) {
+	    this.favoriteTime = favoriteTime;
+	    return this;
+	}
+
+	public Date getFavoriteTime() {
+	    return this.favoriteTime;
+	}
+	public AlbumFavorite setFavoriteFlag(Integer favoriteFlag) {
+	    this.favoriteFlag = favoriteFlag;
+	    return this;
+	}
+
+	public Integer getFavoriteFlag() {
+	    return this.favoriteFlag;
+	}
+
+	public int pageNo;
+    public int pageSize;
+    public String search;
+
+    public String getSearch() {
+        return search;
     }
 
-    public void setAlbumId(Long albumId) {
-        this.albumId = albumId;
+    public void setSearch(String search) {
+        this.search = search;
     }
 
-    public Date getFavoriteTime() {
-        return favoriteTime;
+    public int getPageNo() {
+        return pageNo;
     }
 
-    public void setFavoriteTime(Date favoriteTime) {
-        this.favoriteTime = favoriteTime;
+    public void setPageNo(int pageNo) {
+        this.pageNo = pageNo;
     }
 
-    public Byte getFavoriteFlag() {
-        return favoriteFlag;
+    public int getPageSize() {
+        return pageSize;
     }
 
-    public void setFavoriteFlag(Byte favoriteFlag) {
-        this.favoriteFlag = favoriteFlag;
+    public void setPageSize(int pageSize) {
+        this.pageSize = pageSize;
     }
 
     @Override
     public String toString() {
-        return "AlbumFavorite{" +
-				"id=" + id +
-						",userId='" + userId + "'" + 
-						",albumId='" + albumId + "'" + 
-						",favoriteTime='" + favoriteTime + "'" + 
-						",favoriteFlag='" + favoriteFlag + "'" + 
-		                '}';
+        return ToStringBuilder.reflectionToString(this);
     }
-	
+
 }

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

@@ -1,118 +1,128 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.yonge.cooleshow.common.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 专辑曲谱关联表
- */
-@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.AUTO)
-    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;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getAlbumId() {
-        return albumId;
-    }
+ * @author yzp
+ * @date 2022-03-22 17:55:56
+ * @version v1.0
+ **/
+@ApiModel(value = "album_music_relate-专辑曲谱关联表")
+public class AlbumMusicRelate extends BaseEntity {
 
-    public void setAlbumId(Long albumId) {
-        this.albumId = albumId;
-    }
-
-    public Long getMusicSheetId() {
-        return musicSheetId;
-    }
-
-    public void setMusicSheetId(Long musicSheetId) {
-        this.musicSheetId = musicSheetId;
-    }
-
-    public Byte getSortNumber() {
-        return sortNumber;
+    @TableId(value = "id_", type = IdType.AUTO)
+    @ApiModelProperty(value = "主键id")
+    private Long id;  //主键ID
+
+    @TableField("album_id_")
+    @ApiModelProperty(value = "专辑ID")
+    private Long albumId;  //专辑ID
+
+    @TableField("music_sheet_id_")
+    @ApiModelProperty(value = "曲谱ID")
+    private Long musicSheetId;  //曲谱ID
+
+    @TableField("sort_number_")
+    @ApiModelProperty(value = "排序号")
+    private Integer sortNumber;  //排序号
+
+    @TableField("create_time_")
+    @ApiModelProperty(value = "添加时间")
+    private Date createTime;  //添加时间
+
+    @TableField("create_by_")
+    @ApiModelProperty(value = "添加人")
+    private Long createBy;  //添加人
+
+
+	public AlbumMusicRelate setId(Long id) {
+	    this.id = id;
+	    return this;
+	}
+
+	public Long getId() {
+	    return this.id;
+	}
+	public AlbumMusicRelate setAlbumId(Long albumId) {
+	    this.albumId = albumId;
+	    return this;
+	}
+
+	public Long getAlbumId() {
+	    return this.albumId;
+	}
+	public AlbumMusicRelate setMusicSheetId(Long musicSheetId) {
+	    this.musicSheetId = musicSheetId;
+	    return this;
+	}
+
+	public Long getMusicSheetId() {
+	    return this.musicSheetId;
+	}
+	public AlbumMusicRelate setSortNumber(Integer sortNumber) {
+	    this.sortNumber = sortNumber;
+	    return this;
+	}
+
+	public Integer getSortNumber() {
+	    return this.sortNumber;
+	}
+	public AlbumMusicRelate setCreateTime(Date createTime) {
+	    this.createTime = createTime;
+	    return this;
+	}
+
+	public Date getCreateTime() {
+	    return this.createTime;
+	}
+	public AlbumMusicRelate setCreateBy(Long createBy) {
+	    this.createBy = createBy;
+	    return this;
+	}
+
+	public Long getCreateBy() {
+	    return this.createBy;
+	}
+
+	public int pageNo;
+    public int pageSize;
+    public String search;
+
+    public String getSearch() {
+        return search;
     }
 
-    public void setSortNumber(Byte sortNumber) {
-        this.sortNumber = sortNumber;
+    public void setSearch(String search) {
+        this.search = search;
     }
 
-    public Date getCreateTime() {
-        return createTime;
+    public int getPageNo() {
+        return pageNo;
     }
 
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
+    public void setPageNo(int pageNo) {
+        this.pageNo = pageNo;
     }
 
-    public Long getCreateBy() {
-        return createBy;
+    public int getPageSize() {
+        return pageSize;
     }
 
-    public void setCreateBy(Long createBy) {
-        this.createBy = createBy;
+    public void setPageSize(int pageSize) {
+        this.pageSize = pageSize;
     }
 
     @Override
     public String toString() {
-        return "AlbumMusicRelate{" +
-				"id=" + id +
-						",albumId='" + albumId + "'" + 
-						",musicSheetId='" + musicSheetId + "'" + 
-						",sortNumber='" + sortNumber + "'" + 
-						",createTime='" + createTime + "'" + 
-						",createBy='" + createBy + "'" + 
-		                '}';
+        return ToStringBuilder.reflectionToString(this);
     }
-	
+
 }

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

@@ -0,0 +1,100 @@
+package com.yonge.cooleshow.biz.dal.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 对应数据库表(holidays_festivals):
+ */
+public class HolidaysFestivals {
+
+	@ApiModelProperty(value = "编号",required = false)
+	private Integer id;
+	
+	@ApiModelProperty(value = "年份",required = false)
+	private Integer year;
+	
+	@ApiModelProperty(value = "节假日json",required = false)
+	private String holidaysFestivalsJson;
+	
+	@ApiModelProperty(value = "创建时间",required = false)
+	private java.util.Date createTime;
+	
+	@ApiModelProperty(value = "修改时间",required = false)
+	private java.util.Date updateTime;
+	
+	@ApiModelProperty(value = "创建人",required = false)
+	private Long createBy;
+	
+	@ApiModelProperty(value = "修改人",required = false)
+	private Long updateBy;
+	
+	public HolidaysFestivals setId(Integer id){
+		this.id = id;
+		return this;
+	}
+	
+	public Integer getId(){
+		return this.id;
+	}
+			
+	public HolidaysFestivals setYear(Integer year){
+		this.year = year;
+		return this;
+	}
+	
+	public Integer getYear(){
+		return this.year;
+	}
+			
+	public HolidaysFestivals setHolidaysFestivalsJson(String holidaysFestivalsJson){
+		this.holidaysFestivalsJson = holidaysFestivalsJson;
+		return this;
+	}
+	
+	public String getHolidaysFestivalsJson(){
+		return this.holidaysFestivalsJson;
+	}
+			
+	public HolidaysFestivals setCreateTime(java.util.Date createTime){
+		this.createTime = createTime;
+		return this;
+	}
+	
+	public java.util.Date getCreateTime(){
+		return this.createTime;
+	}
+			
+	public HolidaysFestivals setUpdateTime(java.util.Date updateTime){
+		this.updateTime = updateTime;
+		return this;
+	}
+	
+	public java.util.Date getUpdateTime(){
+		return this.updateTime;
+	}
+			
+	public HolidaysFestivals setCreateBy(Long createBy){
+		this.createBy = createBy;
+		return this;
+	}
+	
+	public Long getCreateBy(){
+		return this.createBy;
+	}
+			
+	public HolidaysFestivals setUpdateBy(Long updateBy){
+		this.updateBy = updateBy;
+		return this;
+	}
+	
+	public Long getUpdateBy(){
+		return this.updateBy;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

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

@@ -1,225 +1,212 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.yonge.cooleshow.common.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 专辑表
- */
-@TableName("music_album")
-@ApiModel(value = "MusicAlbum对象", description = "专辑表")
-public class MusicAlbum implements Serializable {
-	private static final long serialVersionUID = 1L;
-    /** 
-    * 主键 
-    */
-    @ApiModelProperty("主键 ")
-    @TableId(value = "id_", type = IdType.AUTO)
-    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;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getAlbumName() {
-        return albumName;
-    }
-
-    public void setAlbumName(String albumName) {
-        this.albumName = albumName;
-    }
-
-    public String getAlbumDesc() {
-        return albumDesc;
-    }
-
-    public void setAlbumDesc(String albumDesc) {
-        this.albumDesc = albumDesc;
-    }
-
-    public String getAlbumTag() {
-        return albumTag;
-    }
-
-    public void setAlbumTag(String albumTag) {
-        this.albumTag = albumTag;
-    }
-
-    public String getAlbumCoverUrl() {
-        return albumCoverUrl;
-    }
-
-    public void setAlbumCoverUrl(String albumCoverUrl) {
-        this.albumCoverUrl = albumCoverUrl;
-    }
-
-    public Byte getAlbumStatus() {
-        return albumStatus;
-    }
-
-    public void setAlbumStatus(Byte albumStatus) {
-        this.albumStatus = albumStatus;
-    }
-
-    public Integer getSortNumber() {
-        return sortNumber;
-    }
+ * @author yzp
+ * @date 2022-03-22 17:55:56
+ * @version v1.0
+ **/
+@ApiModel(value = "music_album-专辑表")
+public class MusicAlbum extends BaseEntity {
 
-    public void setSortNumber(Integer sortNumber) {
-        this.sortNumber = sortNumber;
-    }
-
-    public Byte getHotFlag() {
-        return hotFlag;
-    }
-
-    public void setHotFlag(Byte hotFlag) {
-        this.hotFlag = hotFlag;
-    }
-
-    public Byte getTopFlag() {
-        return topFlag;
-    }
-
-    public void setTopFlag(Byte topFlag) {
-        this.topFlag = topFlag;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Long getCreateBy() {
-        return createBy;
-    }
-
-    public void setCreateBy(Long createBy) {
-        this.createBy = createBy;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public Long getUpdateBy() {
-        return updateBy;
-    }
-
-    public void setUpdateBy(Long updateBy) {
-        this.updateBy = updateBy;
+    @TableId(value = "id_", type = IdType.AUTO)
+    @ApiModelProperty(value = "主键id")
+    private Long id;  //主键ID
+
+    @TableField("album_name_")
+    @ApiModelProperty(value = "专辑名称")
+    private String albumName;  //专辑名称
+
+    @TableField("album_desc_")
+    @ApiModelProperty(value = "专辑简介")
+    private String albumDesc;  //专辑简介
+
+    @TableField("album_tag_")
+    @ApiModelProperty(value = "专辑标签(多个标签以逗号分开)")
+    private String albumTag;  //专辑标签(多个标签以逗号分开)
+
+    @TableField("album_cover_url_")
+    @ApiModelProperty(value = "专辑封面图片URL")
+    private String albumCoverUrl;  //专辑封面图片URL
+
+    @TableField("album_status_")
+    @ApiModelProperty(value = "专辑状态(1:启用;0:停用)")
+    private Integer albumStatus;  //专辑状态(1:启用;0:停用)
+
+    @TableField("sort_number_")
+    @ApiModelProperty(value = "排序号")
+    private Integer sortNumber;  //排序号
+
+    @TableField("hot_flag_")
+    @ApiModelProperty(value = "是否热门专辑(1:是;0:否)")
+    private Integer hotFlag;  //是否热门专辑(1:是;0:否)
+
+    @TableField("top_flag_")
+    @ApiModelProperty(value = "是否置顶(1:是;0:否)")
+    private Integer topFlag;  //是否置顶(1:是;0:否)
+
+    @TableField("create_time_")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;  //创建时间
+
+    @TableField("create_by_")
+    @ApiModelProperty(value = "创建人")
+    private Long createBy;  //创建人
+
+    @TableField("update_time_")
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;  //更新时间
+
+    @TableField("update_by_")
+    @ApiModelProperty(value = "更新人")
+    private Long updateBy;  //更新人
+
+
+	public MusicAlbum setId(Long id) {
+	    this.id = id;
+	    return this;
+	}
+
+	public Long getId() {
+	    return this.id;
+	}
+	public MusicAlbum setAlbumName(String albumName) {
+	    this.albumName = albumName;
+	    return this;
+	}
+
+	public String getAlbumName() {
+	    return this.albumName;
+	}
+	public MusicAlbum setAlbumDesc(String albumDesc) {
+	    this.albumDesc = albumDesc;
+	    return this;
+	}
+
+	public String getAlbumDesc() {
+	    return this.albumDesc;
+	}
+	public MusicAlbum setAlbumTag(String albumTag) {
+	    this.albumTag = albumTag;
+	    return this;
+	}
+
+	public String getAlbumTag() {
+	    return this.albumTag;
+	}
+	public MusicAlbum setAlbumCoverUrl(String albumCoverUrl) {
+	    this.albumCoverUrl = albumCoverUrl;
+	    return this;
+	}
+
+	public String getAlbumCoverUrl() {
+	    return this.albumCoverUrl;
+	}
+	public MusicAlbum setAlbumStatus(Integer albumStatus) {
+	    this.albumStatus = albumStatus;
+	    return this;
+	}
+
+	public Integer getAlbumStatus() {
+	    return this.albumStatus;
+	}
+	public MusicAlbum setSortNumber(Integer sortNumber) {
+	    this.sortNumber = sortNumber;
+	    return this;
+	}
+
+	public Integer getSortNumber() {
+	    return this.sortNumber;
+	}
+	public MusicAlbum setHotFlag(Integer hotFlag) {
+	    this.hotFlag = hotFlag;
+	    return this;
+	}
+
+	public Integer getHotFlag() {
+	    return this.hotFlag;
+	}
+	public MusicAlbum setTopFlag(Integer topFlag) {
+	    this.topFlag = topFlag;
+	    return this;
+	}
+
+	public Integer getTopFlag() {
+	    return this.topFlag;
+	}
+	public MusicAlbum setCreateTime(Date createTime) {
+	    this.createTime = createTime;
+	    return this;
+	}
+
+	public Date getCreateTime() {
+	    return this.createTime;
+	}
+	public MusicAlbum setCreateBy(Long createBy) {
+	    this.createBy = createBy;
+	    return this;
+	}
+
+	public Long getCreateBy() {
+	    return this.createBy;
+	}
+	public MusicAlbum setUpdateTime(Date updateTime) {
+	    this.updateTime = updateTime;
+	    return this;
+	}
+
+	public Date getUpdateTime() {
+	    return this.updateTime;
+	}
+	public MusicAlbum setUpdateBy(Long updateBy) {
+	    this.updateBy = updateBy;
+	    return this;
+	}
+
+	public Long getUpdateBy() {
+	    return this.updateBy;
+	}
+
+	public int pageNo;
+    public int pageSize;
+    public String search;
+
+    public String getSearch() {
+        return search;
+    }
+
+    public void setSearch(String search) {
+        this.search = search;
+    }
+
+    public int getPageNo() {
+        return pageNo;
+    }
+
+    public void setPageNo(int pageNo) {
+        this.pageNo = pageNo;
+    }
+
+    public int getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(int pageSize) {
+        this.pageSize = pageSize;
     }
 
     @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 + "'" + 
-		                '}';
+        return ToStringBuilder.reflectionToString(this);
     }
-	
+
 }

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

@@ -1,103 +1,116 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.yonge.cooleshow.common.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 乐谱收藏表
- */
-@TableName("music_favorite")
-@ApiModel(value = "MusicFavorite对象", description = "乐谱收藏表")
-public class MusicFavorite implements Serializable {
-	private static final long serialVersionUID = 1L;
-    /** 
-    * 主键 
-    */
-    @ApiModelProperty("主键 ")
+ * @author yzp
+ * @date 2022-03-22 17:55:56
+ * @version v1.0
+ **/
+@ApiModel(value = "music_favorite-乐谱收藏表")
+public class MusicFavorite extends BaseEntity {
+
     @TableId(value = "id_", type = IdType.AUTO)
-    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;
-
-    public Long getId() {
-        return id;
-    }
+    @ApiModelProperty(value = "主键id")
+    private Long id;  //主键ID
 
-    public void setId(Long id) {
-        this.id = id;
-    }
+    @TableField("user_id_")
+    @ApiModelProperty(value = "用户ID(目前只是学生ID)")
+    private Long userId;  //用户ID(目前只是学生ID)
 
-    public Long getUserId() {
-        return userId;
-    }
+    @TableField("music_sheet_id_")
+    @ApiModelProperty(value = "曲谱ID")
+    private Long musicSheetId;  //曲谱ID
+
+    @TableField("favorite_time_")
+    @ApiModelProperty(value = "收藏时间")
+    private Date favoriteTime;  //收藏时间
+
+    @TableField("favorite_flag_")
+    @ApiModelProperty(value = "是否收藏(1:收藏;0:取消收藏)")
+    private Integer favoriteFlag;  //是否收藏(1:收藏;0:取消收藏)
 
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
 
-    public Long getMusicSheetId() {
-        return musicSheetId;
+	public MusicFavorite setId(Long id) {
+	    this.id = id;
+	    return this;
+	}
+
+	public Long getId() {
+	    return this.id;
+	}
+	public MusicFavorite setUserId(Long userId) {
+	    this.userId = userId;
+	    return this;
+	}
+
+	public Long getUserId() {
+	    return this.userId;
+	}
+	public MusicFavorite setMusicSheetId(Long musicSheetId) {
+	    this.musicSheetId = musicSheetId;
+	    return this;
+	}
+
+	public Long getMusicSheetId() {
+	    return this.musicSheetId;
+	}
+	public MusicFavorite setFavoriteTime(Date favoriteTime) {
+	    this.favoriteTime = favoriteTime;
+	    return this;
+	}
+
+	public Date getFavoriteTime() {
+	    return this.favoriteTime;
+	}
+	public MusicFavorite setFavoriteFlag(Integer favoriteFlag) {
+	    this.favoriteFlag = favoriteFlag;
+	    return this;
+	}
+
+	public Integer getFavoriteFlag() {
+	    return this.favoriteFlag;
+	}
+
+	public int pageNo;
+    public int pageSize;
+    public String search;
+
+    public String getSearch() {
+        return search;
     }
 
-    public void setMusicSheetId(Long musicSheetId) {
-        this.musicSheetId = musicSheetId;
+    public void setSearch(String search) {
+        this.search = search;
     }
 
-    public Date getFavoriteTime() {
-        return favoriteTime;
+    public int getPageNo() {
+        return pageNo;
     }
 
-    public void setFavoriteTime(Date favoriteTime) {
-        this.favoriteTime = favoriteTime;
+    public void setPageNo(int pageNo) {
+        this.pageNo = pageNo;
     }
 
-    public Byte getFavoriteFlag() {
-        return favoriteFlag;
+    public int getPageSize() {
+        return pageSize;
     }
 
-    public void setFavoriteFlag(Byte favoriteFlag) {
-        this.favoriteFlag = favoriteFlag;
+    public void setPageSize(int pageSize) {
+        this.pageSize = pageSize;
     }
 
     @Override
     public String toString() {
-        return "MusicFavorite{" +
-				"id=" + id +
-						",userId='" + userId + "'" + 
-						",musicSheetId='" + musicSheetId + "'" + 
-						",favoriteTime='" + favoriteTime + "'" + 
-						",favoriteFlag='" + favoriteFlag + "'" + 
-		                '}';
+        return ToStringBuilder.reflectionToString(this);
     }
-	
+
 }

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

@@ -1,391 +1,360 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.yonge.cooleshow.common.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 
-import java.io.Serializable;
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
 import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.math.BigDecimal;
 
 /**
  * 曲谱表
- */
-@TableName("music_sheet")
-@ApiModel(value = "MusicSheet对象", description = "曲谱表")
-public class MusicSheet implements Serializable {
-	private static final long serialVersionUID = 1L;
-    /** 
-    * 主键 
-    */
-    @ApiModelProperty("主键 ")
-    @TableId(value = "id_", type = IdType.AUTO)
-    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;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getMusicSheetName() {
-        return musicSheetName;
-    }
-
-    public void setMusicSheetName(String musicSheetName) {
-        this.musicSheetName = musicSheetName;
-    }
-
-    public Long getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-    public String getComposer() {
-        return composer;
-    }
-
-    public void setComposer(String composer) {
-        this.composer = composer;
-    }
-
-    public String getMusicSubject() {
-        return musicSubject;
-    }
-
-    public void setMusicSubject(String musicSubject) {
-        this.musicSubject = musicSubject;
-    }
-
-    public String getAudioType() {
-        return audioType;
-    }
-
-    public void setAudioType(String audioType) {
-        this.audioType = audioType;
-    }
-
-    public String getMusicTag() {
-        return musicTag;
-    }
-
-    public void setMusicTag(String musicTag) {
-        this.musicTag = musicTag;
-    }
-
-    public Integer getPlaySpeed() {
-        return playSpeed;
-    }
-
-    public void setPlaySpeed(Integer playSpeed) {
-        this.playSpeed = playSpeed;
-    }
-
-    public Byte getCanEvaluate() {
-        return canEvaluate;
-    }
-
-    public void setCanEvaluate(Byte canEvaluate) {
-        this.canEvaluate = canEvaluate;
-    }
-
-    public Byte getShowFingering() {
-        return showFingering;
-    }
-
-    public void setShowFingering(Byte showFingering) {
-        this.showFingering = showFingering;
-    }
-
-    public Byte getChargeType() {
-        return chargeType;
-    }
-
-    public void setChargeType(Byte chargeType) {
-        this.chargeType = chargeType;
-    }
-
-    public Byte getAuditStatus() {
-        return auditStatus;
-    }
-
-    public void setAuditStatus(Byte auditStatus) {
-        this.auditStatus = auditStatus;
-    }
+ * @author yzp
+ * @date 2022-03-22 17:55:56
+ * @version v1.0
+ **/
+@ApiModel(value = "music_sheet-曲谱表")
+public class MusicSheet extends BaseEntity {
 
-    public Integer getSortNumber() {
-        return sortNumber;
-    }
-
-    public void setSortNumber(Integer sortNumber) {
-        this.sortNumber = sortNumber;
-    }
-
-    public Byte getTopFlag() {
-        return topFlag;
-    }
-
-    public void setTopFlag(Byte topFlag) {
-        this.topFlag = topFlag;
-    }
-
-    public Byte getHotFlag() {
-        return hotFlag;
-    }
-
-    public void setHotFlag(Byte hotFlag) {
-        this.hotFlag = hotFlag;
-    }
-
-    public BigDecimal getMusicPrice() {
-        return musicPrice;
-    }
-
-    public void setMusicPrice(BigDecimal musicPrice) {
-        this.musicPrice = musicPrice;
-    }
-
-    public String getAudioFileUrl() {
-        return audioFileUrl;
-    }
-
-    public void setAudioFileUrl(String audioFileUrl) {
-        this.audioFileUrl = audioFileUrl;
-    }
-
-    public String getXmlFileUrl() {
-        return xmlFileUrl;
-    }
-
-    public void setXmlFileUrl(String xmlFileUrl) {
-        this.xmlFileUrl = xmlFileUrl;
-    }
-
-    public Byte getHasBeat() {
-        return hasBeat;
-    }
-
-    public void setHasBeat(Byte hasBeat) {
-        this.hasBeat = hasBeat;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Long getCreateBy() {
-        return createBy;
-    }
-
-    public void setCreateBy(Long createBy) {
-        this.createBy = createBy;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public Long getUpdateBy() {
-        return updateBy;
-    }
-
-    public void setUpdateBy(Long updateBy) {
-        this.updateBy = updateBy;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
+    @TableId(value = "id_", type = IdType.AUTO)
+    @ApiModelProperty(value = "主键id")
+    private Long id;  //主键ID
+
+    @NotBlank(message = "曲谱名称不能为空!")
+    @Size(max = 64, message = "曲谱名称长度不能超过64位!")
+    @TableField("music_sheet_name_")
+    @ApiModelProperty(value = "曲谱名称")
+    private String musicSheetName;  //曲谱名称
+
+    @NotNull(message = "曲谱来源不能为空")
+    @TableField("user_id_")
+    @ApiModelProperty(value = "曲谱来源(0:平台;非0:老师ID)")
+    private Long userId;  //曲谱来源(0:平台;非0:老师ID)
+
+    @NotBlank(message = "作曲人不能为空!")
+    @Size(max = 32, message = "作曲人长度不能超过64位!")
+    @TableField("composer_")
+    @ApiModelProperty(value = "作曲人")
+    private String composer;  //作曲人
+
+    @NotBlank(message = "作曲人不能为空!")
+    @TableField("music_subject_")
+    @ApiModelProperty(value = "曲谱声部(适用的乐器,可能是多个,用逗号分隔)")
+    private String musicSubject;  //曲谱声部(适用的乐器,可能是多个,用逗号分隔)
+
+    @NotBlank(message = "作曲人不能为空!")
+    @TableField("audio_type_")
+    @ApiModelProperty(value = "曲谱音频文件类型(midi;mp3)")
+    private String audioType;  //曲谱音频文件类型(midi;mp3)
+
+    @TableField("music_tag_")
+    @ApiModelProperty(value = "曲谱标签(多个标签用逗号分隔)")
+    private String musicTag;  //曲谱标签(多个标签用逗号分隔)
+
+    @TableField("play_speed_")
+    @ApiModelProperty(value = "默认播放速度")
+    private Integer playSpeed;  //默认播放速度
+
+    @TableField("can_evaluate_")
+    @ApiModelProperty(value = "是否可以评测(0:否;1:是)")
+    private Integer canEvaluate;  //是否可以评测(0:否;1:是)
+
+    @TableField("show_fingering_")
+    @ApiModelProperty(value = "是否展示指法(0:否;1:是)")
+    private Integer showFingering;  //是否展示指法(0:否;1:是)
+
+    @NotNull(message = "收费类型不能为空!")
+    @TableField("charge_type_")
+    @ApiModelProperty(value = "收费类型(0:免费;1:会员;2:单曲收费)")
+    private Integer chargeType;  //收费类型(0:免费;1:会员;2:单曲收费)
+
+    @NotNull(message = "审核状态不能为空!")
+    @TableField("audit_status_")
+    @ApiModelProperty(value = "审核状态")
+    private Integer auditStatus;  //审核状态
+
+    @TableField("sort_number_")
+    @ApiModelProperty(value = "排序号")
+    private Integer sortNumber;  //排序号
+
+    @TableField("top_flag_")
+    @ApiModelProperty(value = "是否置顶(0:否;1:是)")
+    private Integer topFlag;  //是否置顶(0:否;1:是)
+
+    @TableField("hot_flag_")
+    @ApiModelProperty(value = "是否热门曲谱(0:否;1:是)")
+    private Integer hotFlag;  //是否热门曲谱(0:否;1:是)
+
+    @TableField("music_price_")
+    @ApiModelProperty(value = "曲谱价格")
+    private java.math.BigDecimal musicPrice;  //曲谱价格
+
+    @TableField("audio_file_url_")
+    @ApiModelProperty(value = "音频文件存储路径")
+    private String audioFileUrl;  //音频文件存储路径
+
+    @TableField("xml_file_url_")
+    @ApiModelProperty(value = "XML文件存储路径")
+    private String xmlFileUrl;  //XML文件存储路径
+
+    @TableField("has_beat_")
+    @ApiModelProperty(value = "是否自带节拍器(0:否;1:是)")
+    private Integer hasBeat;  //是否自带节拍器(0:否;1:是)
+
+    @NotNull(message = "创建时间不能为空!")
+    @TableField("create_time_")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;  //创建时间
+
+    @NotNull(message = "创建人不能为空!")
+    @TableField("create_by_")
+    @ApiModelProperty(value = "创建人(老师或者是后台平台用户)")
+    private Long createBy;  //创建人(老师或者是后台平台用户)
+
+    @TableField("update_time_")
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;  //更新时间
+
+    @TableField("update_by_")
+    @ApiModelProperty(value = "更新人(老师或者是后台平台用户)")
+    private Long updateBy;  //更新人(老师或者是后台平台用户)
+
+    @TableField("remark_")
+    @ApiModelProperty(value = "备注")
+    private String remark;  //备注
+
+
+	public MusicSheet setId(Long id) {
+	    this.id = id;
+	    return this;
+	}
+
+	public Long getId() {
+	    return this.id;
+	}
+	public MusicSheet setMusicSheetName(String musicSheetName) {
+	    this.musicSheetName = musicSheetName;
+	    return this;
+	}
+
+	public String getMusicSheetName() {
+	    return this.musicSheetName;
+	}
+	public MusicSheet setUserId(Long userId) {
+	    this.userId = userId;
+	    return this;
+	}
+
+	public Long getUserId() {
+	    return this.userId;
+	}
+	public MusicSheet setComposer(String composer) {
+	    this.composer = composer;
+	    return this;
+	}
+
+	public String getComposer() {
+	    return this.composer;
+	}
+	public MusicSheet setMusicSubject(String musicSubject) {
+	    this.musicSubject = musicSubject;
+	    return this;
+	}
+
+	public String getMusicSubject() {
+	    return this.musicSubject;
+	}
+	public MusicSheet setAudioType(String audioType) {
+	    this.audioType = audioType;
+	    return this;
+	}
+
+	public String getAudioType() {
+	    return this.audioType;
+	}
+	public MusicSheet setMusicTag(String musicTag) {
+	    this.musicTag = musicTag;
+	    return this;
+	}
+
+	public String getMusicTag() {
+	    return this.musicTag;
+	}
+	public MusicSheet setPlaySpeed(Integer playSpeed) {
+	    this.playSpeed = playSpeed;
+	    return this;
+	}
+
+	public Integer getPlaySpeed() {
+	    return this.playSpeed;
+	}
+	public MusicSheet setCanEvaluate(Integer canEvaluate) {
+	    this.canEvaluate = canEvaluate;
+	    return this;
+	}
+
+	public Integer getCanEvaluate() {
+	    return this.canEvaluate;
+	}
+	public MusicSheet setShowFingering(Integer showFingering) {
+	    this.showFingering = showFingering;
+	    return this;
+	}
+
+	public Integer getShowFingering() {
+	    return this.showFingering;
+	}
+	public MusicSheet setChargeType(Integer chargeType) {
+	    this.chargeType = chargeType;
+	    return this;
+	}
+
+	public Integer getChargeType() {
+	    return this.chargeType;
+	}
+	public MusicSheet setAuditStatus(Integer auditStatus) {
+	    this.auditStatus = auditStatus;
+	    return this;
+	}
+
+	public Integer getAuditStatus() {
+	    return this.auditStatus;
+	}
+	public MusicSheet setSortNumber(Integer sortNumber) {
+	    this.sortNumber = sortNumber;
+	    return this;
+	}
+
+	public Integer getSortNumber() {
+	    return this.sortNumber;
+	}
+	public MusicSheet setTopFlag(Integer topFlag) {
+	    this.topFlag = topFlag;
+	    return this;
+	}
+
+	public Integer getTopFlag() {
+	    return this.topFlag;
+	}
+	public MusicSheet setHotFlag(Integer hotFlag) {
+	    this.hotFlag = hotFlag;
+	    return this;
+	}
+
+	public Integer getHotFlag() {
+	    return this.hotFlag;
+	}
+	public MusicSheet setMusicPrice(java.math.BigDecimal musicPrice) {
+	    this.musicPrice = musicPrice;
+	    return this;
+	}
+
+	public java.math.BigDecimal getMusicPrice() {
+	    return this.musicPrice;
+	}
+	public MusicSheet setAudioFileUrl(String audioFileUrl) {
+	    this.audioFileUrl = audioFileUrl;
+	    return this;
+	}
+
+	public String getAudioFileUrl() {
+	    return this.audioFileUrl;
+	}
+	public MusicSheet setXmlFileUrl(String xmlFileUrl) {
+	    this.xmlFileUrl = xmlFileUrl;
+	    return this;
+	}
+
+	public String getXmlFileUrl() {
+	    return this.xmlFileUrl;
+	}
+	public MusicSheet setHasBeat(Integer hasBeat) {
+	    this.hasBeat = hasBeat;
+	    return this;
+	}
+
+	public Integer getHasBeat() {
+	    return this.hasBeat;
+	}
+	public MusicSheet setCreateTime(Date createTime) {
+	    this.createTime = createTime;
+	    return this;
+	}
+
+	public Date getCreateTime() {
+	    return this.createTime;
+	}
+	public MusicSheet setCreateBy(Long createBy) {
+	    this.createBy = createBy;
+	    return this;
+	}
+
+	public Long getCreateBy() {
+	    return this.createBy;
+	}
+	public MusicSheet setUpdateTime(Date updateTime) {
+	    this.updateTime = updateTime;
+	    return this;
+	}
+
+	public Date getUpdateTime() {
+	    return this.updateTime;
+	}
+	public MusicSheet setUpdateBy(Long updateBy) {
+	    this.updateBy = updateBy;
+	    return this;
+	}
+
+	public Long getUpdateBy() {
+	    return this.updateBy;
+	}
+	public MusicSheet setRemark(String remark) {
+	    this.remark = remark;
+	    return this;
+	}
+
+	public String getRemark() {
+	    return this.remark;
+	}
+
+	public int pageNo;
+    public int pageSize;
+    public String search;
+
+    public String getSearch() {
+        return search;
+    }
+
+    public void setSearch(String search) {
+        this.search = search;
+    }
+
+    public int getPageNo() {
+        return pageNo;
+    }
+
+    public void setPageNo(int pageNo) {
+        this.pageNo = pageNo;
+    }
+
+    public int getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(int pageSize) {
+        this.pageSize = pageSize;
     }
 
     @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 + "'" + 
-		                '}';
+        return ToStringBuilder.reflectionToString(this);
     }
-	
+
 }

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

@@ -1,133 +1,140 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.yonge.cooleshow.common.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 曲谱伴奏表
- */
-@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.AUTO)
-    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;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
+ * @author yzp
+ * @date 2022-03-22 17:55:56
+ * @version v1.0
+ **/
+@ApiModel(value = "music_sheet_accompaniment-曲谱伴奏表")
+public class MusicSheetAccompaniment extends BaseEntity {
 
-    public Long getMusicSheetId() {
-        return musicSheetId;
-    }
-
-    public void setMusicSheetId(Long musicSheetId) {
-        this.musicSheetId = musicSheetId;
-    }
-
-    public String getMusicSubject() {
-        return musicSubject;
-    }
-
-    public void setMusicSubject(String musicSubject) {
-        this.musicSubject = musicSubject;
-    }
-
-    public String getAudioFileUrl() {
-        return audioFileUrl;
-    }
-
-    public void setAudioFileUrl(String audioFileUrl) {
-        this.audioFileUrl = audioFileUrl;
-    }
-
-    public Byte getSortNumber() {
-        return sortNumber;
+    @TableId(value = "id_", type = IdType.AUTO)
+    @ApiModelProperty(value = "主键id")
+    private Long id;  //主键ID
+
+    @TableField("music_sheet_id_")
+    @ApiModelProperty(value = "曲谱ID")
+    private Long musicSheetId;  //曲谱ID
+
+    @TableField("music_subject_")
+    @ApiModelProperty(value = "声部")
+    private String musicSubject;  //声部
+
+    @TableField("audio_file_url_")
+    @ApiModelProperty(value = "MP3原声音频文件URL")
+    private String audioFileUrl;  //MP3原声音频文件URL
+
+    @TableField("sort_number_")
+    @ApiModelProperty(value = "排序号")
+    private Integer sortNumber;  //排序号
+
+    @TableField("create_time_")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;  //创建时间
+
+    @TableField("create_by_")
+    @ApiModelProperty(value = "创建人(老师或者是后台平台用户)")
+    private Long createBy;  //创建人(老师或者是后台平台用户)
+
+
+	public MusicSheetAccompaniment setId(Long id) {
+	    this.id = id;
+	    return this;
+	}
+
+	public Long getId() {
+	    return this.id;
+	}
+	public MusicSheetAccompaniment setMusicSheetId(Long musicSheetId) {
+	    this.musicSheetId = musicSheetId;
+	    return this;
+	}
+
+	public Long getMusicSheetId() {
+	    return this.musicSheetId;
+	}
+	public MusicSheetAccompaniment setMusicSubject(String musicSubject) {
+	    this.musicSubject = musicSubject;
+	    return this;
+	}
+
+	public String getMusicSubject() {
+	    return this.musicSubject;
+	}
+	public MusicSheetAccompaniment setAudioFileUrl(String audioFileUrl) {
+	    this.audioFileUrl = audioFileUrl;
+	    return this;
+	}
+
+	public String getAudioFileUrl() {
+	    return this.audioFileUrl;
+	}
+	public MusicSheetAccompaniment setSortNumber(Integer sortNumber) {
+	    this.sortNumber = sortNumber;
+	    return this;
+	}
+
+	public Integer getSortNumber() {
+	    return this.sortNumber;
+	}
+	public MusicSheetAccompaniment setCreateTime(Date createTime) {
+	    this.createTime = createTime;
+	    return this;
+	}
+
+	public Date getCreateTime() {
+	    return this.createTime;
+	}
+	public MusicSheetAccompaniment setCreateBy(Long createBy) {
+	    this.createBy = createBy;
+	    return this;
+	}
+
+	public Long getCreateBy() {
+	    return this.createBy;
+	}
+
+	public int pageNo;
+    public int pageSize;
+    public String search;
+
+    public String getSearch() {
+        return search;
     }
 
-    public void setSortNumber(Byte sortNumber) {
-        this.sortNumber = sortNumber;
+    public void setSearch(String search) {
+        this.search = search;
     }
 
-    public Date getCreateTime() {
-        return createTime;
+    public int getPageNo() {
+        return pageNo;
     }
 
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
+    public void setPageNo(int pageNo) {
+        this.pageNo = pageNo;
     }
 
-    public Long getCreateBy() {
-        return createBy;
+    public int getPageSize() {
+        return pageSize;
     }
 
-    public void setCreateBy(Long createBy) {
-        this.createBy = createBy;
+    public void setPageSize(int pageSize) {
+        this.pageSize = pageSize;
     }
 
     @Override
     public String toString() {
-        return "MusicSheetAccompaniment{" +
-				"id=" + id +
-						",musicSheetId='" + musicSheetId + "'" + 
-						",musicSubject='" + musicSubject + "'" + 
-						",audioFileUrl='" + audioFileUrl + "'" + 
-						",sortNumber='" + sortNumber + "'" + 
-						",createTime='" + createTime + "'" + 
-						",createBy='" + createBy + "'" + 
-		                '}';
+        return ToStringBuilder.reflectionToString(this);
     }
-	
+
 }

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

@@ -1,149 +1,152 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.yonge.cooleshow.common.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.math.BigDecimal;
 
 /**
  * 曲谱购买记录表
- */
-@TableName("music_sheet_purchase_record")
-@ApiModel(value = "MusicSheetPurchaseRecord对象", description = "曲谱购买记录表")
-public class MusicSheetPurchaseRecord implements Serializable {
-	private static final long serialVersionUID = 1L;
-    /** 
-    * 主键 
-    */
-    @ApiModelProperty("主键 ")
+ * @author yzp
+ * @date 2022-03-22 17:55:57
+ * @version v1.0
+ **/
+@ApiModel(value = "music_sheet_purchase_record-曲谱购买记录表")
+public class MusicSheetPurchaseRecord extends BaseEntity {
+
     @TableId(value = "id_", type = IdType.AUTO)
-    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;
-
-    public Long getId() {
-        return id;
-    }
+    @ApiModelProperty(value = "主键id")
+    private Long id;  //主键ID
+
+    @TableField("music_sheet_id_")
+    @ApiModelProperty(value = "曲谱ID")
+    private Long musicSheetId;  //曲谱ID
+
+    @TableField("teacher_id_")
+    @ApiModelProperty(value = "老师ID")
+    private Long teacherId;  //老师ID
+
+    @TableField("order_no_")
+    @ApiModelProperty(value = "订单流水号")
+    private String orderNo;  //订单流水号
+
+    @TableField("student_id_")
+    @ApiModelProperty(value = "学生ID")
+    private Long studentId;  //学生ID
+
+    @TableField("purchase_time_")
+    @ApiModelProperty(value = "购买时间")
+    private Date purchaseTime;  //购买时间
+
+    @TableField("purchase_price_")
+    @ApiModelProperty(value = "购买价格")
+    private java.math.BigDecimal purchasePrice;  //购买价格
 
-    public void setId(Long id) {
-        this.id = id;
-    }
+    @TableField("order_status_")
+    @ApiModelProperty(value = "订单状态(1:已完成;0:取消)")
+    private Integer orderStatus;  //订单状态(1:已完成;0:取消)
 
-    public Long getMusicSheetId() {
-        return musicSheetId;
-    }
 
-    public void setMusicSheetId(Long musicSheetId) {
-        this.musicSheetId = musicSheetId;
-    }
+	public MusicSheetPurchaseRecord setId(Long id) {
+	    this.id = id;
+	    return this;
+	}
 
-    public Long getTeacherId() {
-        return teacherId;
-    }
+	public Long getId() {
+	    return this.id;
+	}
+	public MusicSheetPurchaseRecord setMusicSheetId(Long musicSheetId) {
+	    this.musicSheetId = musicSheetId;
+	    return this;
+	}
 
-    public void setTeacherId(Long teacherId) {
-        this.teacherId = teacherId;
-    }
+	public Long getMusicSheetId() {
+	    return this.musicSheetId;
+	}
+	public MusicSheetPurchaseRecord setTeacherId(Long teacherId) {
+	    this.teacherId = teacherId;
+	    return this;
+	}
 
-    public String getOrderNo() {
-        return orderNo;
-    }
+	public Long getTeacherId() {
+	    return this.teacherId;
+	}
+	public MusicSheetPurchaseRecord setOrderNo(String orderNo) {
+	    this.orderNo = orderNo;
+	    return this;
+	}
 
-    public void setOrderNo(String orderNo) {
-        this.orderNo = orderNo;
-    }
+	public String getOrderNo() {
+	    return this.orderNo;
+	}
+	public MusicSheetPurchaseRecord setStudentId(Long studentId) {
+	    this.studentId = studentId;
+	    return this;
+	}
 
-    public Long getStudentId() {
-        return studentId;
-    }
+	public Long getStudentId() {
+	    return this.studentId;
+	}
+	public MusicSheetPurchaseRecord setPurchaseTime(Date purchaseTime) {
+	    this.purchaseTime = purchaseTime;
+	    return this;
+	}
 
-    public void setStudentId(Long studentId) {
-        this.studentId = studentId;
-    }
+	public Date getPurchaseTime() {
+	    return this.purchaseTime;
+	}
+	public MusicSheetPurchaseRecord setPurchasePrice(java.math.BigDecimal purchasePrice) {
+	    this.purchasePrice = purchasePrice;
+	    return this;
+	}
 
-    public Date getPurchaseTime() {
-        return purchaseTime;
+	public java.math.BigDecimal getPurchasePrice() {
+	    return this.purchasePrice;
+	}
+	public MusicSheetPurchaseRecord setOrderStatus(Integer orderStatus) {
+	    this.orderStatus = orderStatus;
+	    return this;
+	}
+
+	public Integer getOrderStatus() {
+	    return this.orderStatus;
+	}
+
+	public int pageNo;
+    public int pageSize;
+    public String search;
+
+    public String getSearch() {
+        return search;
     }
 
-    public void setPurchaseTime(Date purchaseTime) {
-        this.purchaseTime = purchaseTime;
+    public void setSearch(String search) {
+        this.search = search;
     }
 
-    public BigDecimal getPurchasePrice() {
-        return purchasePrice;
+    public int getPageNo() {
+        return pageNo;
     }
 
-    public void setPurchasePrice(BigDecimal purchasePrice) {
-        this.purchasePrice = purchasePrice;
+    public void setPageNo(int pageNo) {
+        this.pageNo = pageNo;
     }
 
-    public Byte getOrderStatus() {
-        return orderStatus;
+    public int getPageSize() {
+        return pageSize;
     }
 
-    public void setOrderStatus(Byte orderStatus) {
-        this.orderStatus = orderStatus;
+    public void setPageSize(int pageSize) {
+        this.pageSize = pageSize;
     }
 
     @Override
     public String toString() {
-        return "MusicSheetPurchaseRecord{" +
-				"id=" + id +
-						",musicSheetId='" + musicSheetId + "'" + 
-						",teacherId='" + teacherId + "'" + 
-						",orderNo='" + orderNo + "'" + 
-						",studentId='" + studentId + "'" + 
-						",purchaseTime='" + purchaseTime + "'" + 
-						",purchasePrice='" + purchasePrice + "'" + 
-						",orderStatus='" + orderStatus + "'" + 
-		                '}';
+        return ToStringBuilder.reflectionToString(this);
     }
-	
+
 }

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

@@ -84,6 +84,13 @@ public class Teacher implements Serializable {
     @ApiModelProperty("音乐人审核状态   1、审核中 2、通过 3、不通过 ")
 	@TableField(value = "musician_auth_status_")
     private Integer musicianAuthStatus;
+    /**
+     * 直播权限 0 否 1 是
+     */
+    @ApiModelProperty("直播权限 0 否 1 是")
+    @TableField(value = "live_flag_")
+    private Integer liveFlag;
+
     /** 
     * 音乐人认证时间 
     */
@@ -274,4 +281,12 @@ public class Teacher implements Serializable {
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
+
+    public Integer getLiveFlag() {
+        return liveFlag;
+    }
+
+    public void setLiveFlag(Integer liveFlag) {
+        this.liveFlag = liveFlag;
+    }
 }

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

@@ -1,103 +1,116 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.yonge.cooleshow.common.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 视频课学员评价
- */
-@TableName("video_lesson_evaluate")
-@ApiModel(value = "VideoLessonEvaluate对象", description = "视频课学员评价")
-public class VideoLessonEvaluate implements Serializable {
-	private static final long serialVersionUID = 1L;
-    /** 
-    * 主键 
-    */
-    @ApiModelProperty("主键 ")
+ * @author yzp
+ * @date 2022-03-22 17:55:57
+ * @version v1.0
+ **/
+@ApiModel(value = "video_lesson_evaluate-视频课学员评价")
+public class VideoLessonEvaluate extends BaseEntity {
+
     @TableId(value = "id_", type = IdType.AUTO)
-    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;
-
-    public Long getId() {
-        return id;
-    }
+    @ApiModelProperty(value = "主键id")
+    private Long id;  //主键ID
 
-    public void setId(Long id) {
-        this.id = id;
-    }
+    @TableField("video_id_")
+    @ApiModelProperty(value = "视频ID")
+    private Long videoId;  //视频ID
 
-    public Long getVideoId() {
-        return videoId;
-    }
+    @TableField("student_id_")
+    @ApiModelProperty(value = "学生ID")
+    private Long studentId;  //学生ID
+
+    @TableField("content_")
+    @ApiModelProperty(value = "评价内容")
+    private String content;  //评价内容
+
+    @TableField("evaluate_time_")
+    @ApiModelProperty(value = "评价时间")
+    private Date evaluateTime;  //评价时间
 
-    public void setVideoId(Long videoId) {
-        this.videoId = videoId;
-    }
 
-    public Long getStudentId() {
-        return studentId;
+	public VideoLessonEvaluate setId(Long id) {
+	    this.id = id;
+	    return this;
+	}
+
+	public Long getId() {
+	    return this.id;
+	}
+	public VideoLessonEvaluate setVideoId(Long videoId) {
+	    this.videoId = videoId;
+	    return this;
+	}
+
+	public Long getVideoId() {
+	    return this.videoId;
+	}
+	public VideoLessonEvaluate setStudentId(Long studentId) {
+	    this.studentId = studentId;
+	    return this;
+	}
+
+	public Long getStudentId() {
+	    return this.studentId;
+	}
+	public VideoLessonEvaluate setContent(String content) {
+	    this.content = content;
+	    return this;
+	}
+
+	public String getContent() {
+	    return this.content;
+	}
+	public VideoLessonEvaluate setEvaluateTime(Date evaluateTime) {
+	    this.evaluateTime = evaluateTime;
+	    return this;
+	}
+
+	public Date getEvaluateTime() {
+	    return this.evaluateTime;
+	}
+
+	public int pageNo;
+    public int pageSize;
+    public String search;
+
+    public String getSearch() {
+        return search;
     }
 
-    public void setStudentId(Long studentId) {
-        this.studentId = studentId;
+    public void setSearch(String search) {
+        this.search = search;
     }
 
-    public String getContent() {
-        return content;
+    public int getPageNo() {
+        return pageNo;
     }
 
-    public void setContent(String content) {
-        this.content = content;
+    public void setPageNo(int pageNo) {
+        this.pageNo = pageNo;
     }
 
-    public Date getEvaluateTime() {
-        return evaluateTime;
+    public int getPageSize() {
+        return pageSize;
     }
 
-    public void setEvaluateTime(Date evaluateTime) {
-        this.evaluateTime = evaluateTime;
+    public void setPageSize(int pageSize) {
+        this.pageSize = pageSize;
     }
 
     @Override
     public String toString() {
-        return "VideoLessonEvaluate{" +
-				"id=" + id +
-						",videoId='" + videoId + "'" + 
-						",studentId='" + studentId + "'" + 
-						",content='" + content + "'" + 
-						",evaluateTime='" + evaluateTime + "'" + 
-		                '}';
+        return ToStringBuilder.reflectionToString(this);
     }
-	
+
 }

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

@@ -1,255 +1,236 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.yonge.cooleshow.common.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 视频课基本信息表
- */
-@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.AUTO)
-    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;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getLessonName() {
-        return lessonName;
-    }
-
-    public void setLessonName(String lessonName) {
-        this.lessonName = lessonName;
-    }
-
-    public String getLessonSubject() {
-        return lessonSubject;
-    }
-
-    public void setLessonSubject(String lessonSubject) {
-        this.lessonSubject = lessonSubject;
-    }
-
-    public String getLessonDesc() {
-        return lessonDesc;
-    }
-
-    public void setLessonDesc(String lessonDesc) {
-        this.lessonDesc = lessonDesc;
-    }
-
-    public Integer getLessonPrice() {
-        return lessonPrice;
-    }
-
-    public void setLessonPrice(Integer lessonPrice) {
-        this.lessonPrice = lessonPrice;
-    }
-
-    public String getLessonCoverUrl() {
-        return lessonCoverUrl;
-    }
-
-    public void setLessonCoverUrl(String lessonCoverUrl) {
-        this.lessonCoverUrl = lessonCoverUrl;
-    }
-
-    public Long getTeacherId() {
-        return teacherId;
-    }
-
-    public void setTeacherId(Long teacherId) {
-        this.teacherId = teacherId;
-    }
-
-    public Integer getLessonCount() {
-        return lessonCount;
-    }
+ * @author yzp
+ * @date 2022-03-22 17:55:57
+ * @version v1.0
+ **/
+@ApiModel(value = "video_lesson_group-视频课基本信息表")
+public class VideoLessonGroup extends BaseEntity {
 
-    public void setLessonCount(Integer lessonCount) {
-        this.lessonCount = lessonCount;
-    }
-
-    public Integer getSortNumber() {
-        return sortNumber;
-    }
-
-    public void setSortNumber(Integer sortNumber) {
-        this.sortNumber = sortNumber;
-    }
-
-    public String getLessonTag() {
-        return lessonTag;
-    }
-
-    public void setLessonTag(String lessonTag) {
-        this.lessonTag = lessonTag;
-    }
-
-    public Byte getTopFlag() {
-        return topFlag;
-    }
-
-    public void setTopFlag(Byte topFlag) {
-        this.topFlag = topFlag;
-    }
-
-    public Byte getHotFlag() {
-        return hotFlag;
-    }
-
-    public void setHotFlag(Byte hotFlag) {
-        this.hotFlag = hotFlag;
-    }
-
-    public Byte getAuditStatus() {
-        return auditStatus;
-    }
-
-    public void setAuditStatus(Byte auditStatus) {
-        this.auditStatus = auditStatus;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
+    @TableId(value = "id_", type = IdType.AUTO)
+    @ApiModelProperty(value = "主键id")
+    private Long id;  //主键ID
+
+    @TableField("lesson_name_")
+    @ApiModelProperty(value = "课程名称")
+    private String lessonName;  //课程名称
+
+    @TableField("lesson_subject_")
+    @ApiModelProperty(value = "课程声部")
+    private String lessonSubject;  //课程声部
+
+    @TableField("lesson_desc_")
+    @ApiModelProperty(value = "课程介绍")
+    private String lessonDesc;  //课程介绍
+
+    @TableField("lesson_price_")
+    @ApiModelProperty(value = "课程价格")
+    private Integer lessonPrice;  //课程价格
+
+    @TableField("lesson_cover_url_")
+    @ApiModelProperty(value = "课程封面图片URL")
+    private String lessonCoverUrl;  //课程封面图片URL
+
+    @TableField("teacher_id_")
+    @ApiModelProperty(value = "老师ID")
+    private Long teacherId;  //老师ID
+
+    @TableField("lesson_count_")
+    @ApiModelProperty(value = "课程节数")
+    private Integer lessonCount;  //课程节数
+
+    @TableField("sort_number_")
+    @ApiModelProperty(value = "排序号")
+    private Integer sortNumber;  //排序号
+
+    @TableField("lesson_tag_")
+    @ApiModelProperty(value = "课程标签")
+    private String lessonTag;  //课程标签
+
+    @TableField("top_flag_")
+    @ApiModelProperty(value = "是否置顶")
+    private Integer topFlag;  //是否置顶
+
+    @TableField("hot_flag_")
+    @ApiModelProperty(value = "是否热门课程")
+    private Integer hotFlag;  //是否热门课程
+
+    @TableField("audit_status_")
+    @ApiModelProperty(value = "审核状态")
+    private Integer auditStatus;  //审核状态
+
+    @TableField("create_time_")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;  //创建时间
+
+    @TableField("update_time_")
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;  //更新时间
+
+
+	public VideoLessonGroup setId(Long id) {
+	    this.id = id;
+	    return this;
+	}
+
+	public Long getId() {
+	    return this.id;
+	}
+	public VideoLessonGroup setLessonName(String lessonName) {
+	    this.lessonName = lessonName;
+	    return this;
+	}
+
+	public String getLessonName() {
+	    return this.lessonName;
+	}
+	public VideoLessonGroup setLessonSubject(String lessonSubject) {
+	    this.lessonSubject = lessonSubject;
+	    return this;
+	}
+
+	public String getLessonSubject() {
+	    return this.lessonSubject;
+	}
+	public VideoLessonGroup setLessonDesc(String lessonDesc) {
+	    this.lessonDesc = lessonDesc;
+	    return this;
+	}
+
+	public String getLessonDesc() {
+	    return this.lessonDesc;
+	}
+	public VideoLessonGroup setLessonPrice(Integer lessonPrice) {
+	    this.lessonPrice = lessonPrice;
+	    return this;
+	}
+
+	public Integer getLessonPrice() {
+	    return this.lessonPrice;
+	}
+	public VideoLessonGroup setLessonCoverUrl(String lessonCoverUrl) {
+	    this.lessonCoverUrl = lessonCoverUrl;
+	    return this;
+	}
+
+	public String getLessonCoverUrl() {
+	    return this.lessonCoverUrl;
+	}
+	public VideoLessonGroup setTeacherId(Long teacherId) {
+	    this.teacherId = teacherId;
+	    return this;
+	}
+
+	public Long getTeacherId() {
+	    return this.teacherId;
+	}
+	public VideoLessonGroup setLessonCount(Integer lessonCount) {
+	    this.lessonCount = lessonCount;
+	    return this;
+	}
+
+	public Integer getLessonCount() {
+	    return this.lessonCount;
+	}
+	public VideoLessonGroup setSortNumber(Integer sortNumber) {
+	    this.sortNumber = sortNumber;
+	    return this;
+	}
+
+	public Integer getSortNumber() {
+	    return this.sortNumber;
+	}
+	public VideoLessonGroup setLessonTag(String lessonTag) {
+	    this.lessonTag = lessonTag;
+	    return this;
+	}
+
+	public String getLessonTag() {
+	    return this.lessonTag;
+	}
+	public VideoLessonGroup setTopFlag(Integer topFlag) {
+	    this.topFlag = topFlag;
+	    return this;
+	}
+
+	public Integer getTopFlag() {
+	    return this.topFlag;
+	}
+	public VideoLessonGroup setHotFlag(Integer hotFlag) {
+	    this.hotFlag = hotFlag;
+	    return this;
+	}
+
+	public Integer getHotFlag() {
+	    return this.hotFlag;
+	}
+	public VideoLessonGroup setAuditStatus(Integer auditStatus) {
+	    this.auditStatus = auditStatus;
+	    return this;
+	}
+
+	public Integer getAuditStatus() {
+	    return this.auditStatus;
+	}
+	public VideoLessonGroup setCreateTime(Date createTime) {
+	    this.createTime = createTime;
+	    return this;
+	}
+
+	public Date getCreateTime() {
+	    return this.createTime;
+	}
+	public VideoLessonGroup setUpdateTime(Date updateTime) {
+	    this.updateTime = updateTime;
+	    return this;
+	}
+
+	public Date getUpdateTime() {
+	    return this.updateTime;
+	}
+
+	public int pageNo;
+    public int pageSize;
+    public String search;
+
+    public String getSearch() {
+        return search;
+    }
+
+    public void setSearch(String search) {
+        this.search = search;
+    }
+
+    public int getPageNo() {
+        return pageNo;
+    }
+
+    public void setPageNo(int pageNo) {
+        this.pageNo = pageNo;
+    }
+
+    public int getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(int pageSize) {
+        this.pageSize = pageSize;
     }
 
     @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 + "'" + 
-		                '}';
+        return ToStringBuilder.reflectionToString(this);
     }
-	
+
 }

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

@@ -1,210 +1,200 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.yonge.cooleshow.common.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 视频课明细表
- */
-@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.AUTO)
-    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;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getVideoLessonGroupId() {
-        return videoLessonGroupId;
-    }
-
-    public void setVideoLessonGroupId(Long videoLessonGroupId) {
-        this.videoLessonGroupId = videoLessonGroupId;
-    }
-
-    public String getVideoTitle() {
-        return videoTitle;
-    }
-
-    public void setVideoTitle(String videoTitle) {
-        this.videoTitle = videoTitle;
-    }
-
-    public String getVideoContent() {
-        return videoContent;
-    }
-
-    public void setVideoContent(String videoContent) {
-        this.videoContent = videoContent;
-    }
-
-    public String getVideoUrl() {
-        return videoUrl;
-    }
-
-    public void setVideoUrl(String videoUrl) {
-        this.videoUrl = videoUrl;
-    }
-
-    public String getCoverUrl() {
-        return coverUrl;
-    }
-
-    public void setCoverUrl(String coverUrl) {
-        this.coverUrl = coverUrl;
-    }
+ * @author yzp
+ * @date 2022-03-22 17:55:57
+ * @version v1.0
+ **/
+@ApiModel(value = "video_lesson_group_detail-视频课明细表")
+public class VideoLessonGroupDetail extends BaseEntity {
 
-    public Byte getChargeFlag() {
-        return chargeFlag;
-    }
-
-    public void setChargeFlag(Byte chargeFlag) {
-        this.chargeFlag = chargeFlag;
-    }
-
-    public Integer getSortNumber() {
-        return sortNumber;
-    }
-
-    public void setSortNumber(Integer sortNumber) {
-        this.sortNumber = sortNumber;
-    }
-
-    public Long getTeacherId() {
-        return teacherId;
-    }
-
-    public void setTeacherId(Long teacherId) {
-        this.teacherId = teacherId;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Long getUpdateBy() {
-        return updateBy;
-    }
-
-    public void setUpdateBy(Long updateBy) {
-        this.updateBy = updateBy;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
+    @TableId(value = "id_", type = IdType.AUTO)
+    @ApiModelProperty(value = "主键id")
+    private Long id;  //主键ID
+
+    @TableField("video_lesson_group_id_")
+    @ApiModelProperty(value = "课程组ID")
+    private Long videoLessonGroupId;  //课程组ID
+
+    @TableField("video_title_")
+    @ApiModelProperty(value = "视频标题")
+    private String videoTitle;  //视频标题
+
+    @TableField("video_content_")
+    @ApiModelProperty(value = "视频内容")
+    private String videoContent;  //视频内容
+
+    @TableField("video_url_")
+    @ApiModelProperty(value = "视频文件URL")
+    private String videoUrl;  //视频文件URL
+
+    @TableField("cover_url_")
+    @ApiModelProperty(value = "视频封面图片URL")
+    private String coverUrl;  //视频封面图片URL
+
+    @TableField("charge_flag_")
+    @ApiModelProperty(value = "是否收费(1:收费;0:免费)")
+    private Integer chargeFlag;  //是否收费(1:收费;0:免费)
+
+    @TableField("sort_number_")
+    @ApiModelProperty(value = "排序号")
+    private Integer sortNumber;  //排序号
+
+    @TableField("teacher_id_")
+    @ApiModelProperty(value = "创建人(老师ID)")
+    private Long teacherId;  //创建人(老师ID)
+
+    @TableField("create_time_")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;  //创建时间
+
+    @TableField("update_by_")
+    @ApiModelProperty(value = "更新人")
+    private Long updateBy;  //更新人
+
+    @TableField("update_time_")
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;  //更新时间
+
+
+	public VideoLessonGroupDetail setId(Long id) {
+	    this.id = id;
+	    return this;
+	}
+
+	public Long getId() {
+	    return this.id;
+	}
+	public VideoLessonGroupDetail setVideoLessonGroupId(Long videoLessonGroupId) {
+	    this.videoLessonGroupId = videoLessonGroupId;
+	    return this;
+	}
+
+	public Long getVideoLessonGroupId() {
+	    return this.videoLessonGroupId;
+	}
+	public VideoLessonGroupDetail setVideoTitle(String videoTitle) {
+	    this.videoTitle = videoTitle;
+	    return this;
+	}
+
+	public String getVideoTitle() {
+	    return this.videoTitle;
+	}
+	public VideoLessonGroupDetail setVideoContent(String videoContent) {
+	    this.videoContent = videoContent;
+	    return this;
+	}
+
+	public String getVideoContent() {
+	    return this.videoContent;
+	}
+	public VideoLessonGroupDetail setVideoUrl(String videoUrl) {
+	    this.videoUrl = videoUrl;
+	    return this;
+	}
+
+	public String getVideoUrl() {
+	    return this.videoUrl;
+	}
+	public VideoLessonGroupDetail setCoverUrl(String coverUrl) {
+	    this.coverUrl = coverUrl;
+	    return this;
+	}
+
+	public String getCoverUrl() {
+	    return this.coverUrl;
+	}
+	public VideoLessonGroupDetail setChargeFlag(Integer chargeFlag) {
+	    this.chargeFlag = chargeFlag;
+	    return this;
+	}
+
+	public Integer getChargeFlag() {
+	    return this.chargeFlag;
+	}
+	public VideoLessonGroupDetail setSortNumber(Integer sortNumber) {
+	    this.sortNumber = sortNumber;
+	    return this;
+	}
+
+	public Integer getSortNumber() {
+	    return this.sortNumber;
+	}
+	public VideoLessonGroupDetail setTeacherId(Long teacherId) {
+	    this.teacherId = teacherId;
+	    return this;
+	}
+
+	public Long getTeacherId() {
+	    return this.teacherId;
+	}
+	public VideoLessonGroupDetail setCreateTime(Date createTime) {
+	    this.createTime = createTime;
+	    return this;
+	}
+
+	public Date getCreateTime() {
+	    return this.createTime;
+	}
+	public VideoLessonGroupDetail setUpdateBy(Long updateBy) {
+	    this.updateBy = updateBy;
+	    return this;
+	}
+
+	public Long getUpdateBy() {
+	    return this.updateBy;
+	}
+	public VideoLessonGroupDetail setUpdateTime(Date updateTime) {
+	    this.updateTime = updateTime;
+	    return this;
+	}
+
+	public Date getUpdateTime() {
+	    return this.updateTime;
+	}
+
+	public int pageNo;
+    public int pageSize;
+    public String search;
+
+    public String getSearch() {
+        return search;
+    }
+
+    public void setSearch(String search) {
+        this.search = search;
+    }
+
+    public int getPageNo() {
+        return pageNo;
+    }
+
+    public void setPageNo(int pageNo) {
+        this.pageNo = pageNo;
+    }
+
+    public int getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(int pageSize) {
+        this.pageSize = pageSize;
     }
 
     @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 + "'" + 
-		                '}';
+        return ToStringBuilder.reflectionToString(this);
     }
-	
+
 }

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

@@ -1,134 +1,140 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.yonge.cooleshow.common.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.math.BigDecimal;
 
 /**
  * 视频课购买记录表
- */
-@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.AUTO)
-    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;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
+ * @author yzp
+ * @date 2022-03-22 17:55:57
+ * @version v1.0
+ **/
+@ApiModel(value = "video_lesson_purchase_record-视频课购买记录表")
+public class VideoLessonPurchaseRecord extends BaseEntity {
 
-    public Long getVideoLessonGroupId() {
-        return videoLessonGroupId;
-    }
-
-    public void setVideoLessonGroupId(Long videoLessonGroupId) {
-        this.videoLessonGroupId = videoLessonGroupId;
-    }
-
-    public Long getStudentId() {
-        return studentId;
-    }
-
-    public void setStudentId(Long studentId) {
-        this.studentId = studentId;
-    }
-
-    public Date getPurchaseTime() {
-        return purchaseTime;
-    }
-
-    public void setPurchaseTime(Date purchaseTime) {
-        this.purchaseTime = purchaseTime;
-    }
-
-    public BigDecimal getPayMoney() {
-        return payMoney;
+    @TableId(value = "id_", type = IdType.AUTO)
+    @ApiModelProperty(value = "主键id")
+    private Long id;  //主键ID
+
+    @TableField("video_lesson_group_id_")
+    @ApiModelProperty(value = "视频课组ID")
+    private Long videoLessonGroupId;  //视频课组ID
+
+    @TableField("student_id_")
+    @ApiModelProperty(value = "学生ID")
+    private Long studentId;  //学生ID
+
+    @TableField("purchase_time_")
+    @ApiModelProperty(value = "购买时间")
+    private Date purchaseTime;  //购买时间
+
+    @TableField("pay_money_")
+    @ApiModelProperty(value = "支付金额")
+    private java.math.BigDecimal payMoney;  //支付金额
+
+    @TableField("order_no_")
+    @ApiModelProperty(value = "订单流水号")
+    private String orderNo;  //订单流水号
+
+    @TableField("order_status_")
+    @ApiModelProperty(value = "订单状态(1:已完成;0:取消)")
+    private Integer orderStatus;  //订单状态(1:已完成;0:取消)
+
+
+	public VideoLessonPurchaseRecord setId(Long id) {
+	    this.id = id;
+	    return this;
+	}
+
+	public Long getId() {
+	    return this.id;
+	}
+	public VideoLessonPurchaseRecord setVideoLessonGroupId(Long videoLessonGroupId) {
+	    this.videoLessonGroupId = videoLessonGroupId;
+	    return this;
+	}
+
+	public Long getVideoLessonGroupId() {
+	    return this.videoLessonGroupId;
+	}
+	public VideoLessonPurchaseRecord setStudentId(Long studentId) {
+	    this.studentId = studentId;
+	    return this;
+	}
+
+	public Long getStudentId() {
+	    return this.studentId;
+	}
+	public VideoLessonPurchaseRecord setPurchaseTime(Date purchaseTime) {
+	    this.purchaseTime = purchaseTime;
+	    return this;
+	}
+
+	public Date getPurchaseTime() {
+	    return this.purchaseTime;
+	}
+	public VideoLessonPurchaseRecord setPayMoney(java.math.BigDecimal payMoney) {
+	    this.payMoney = payMoney;
+	    return this;
+	}
+
+	public java.math.BigDecimal getPayMoney() {
+	    return this.payMoney;
+	}
+	public VideoLessonPurchaseRecord setOrderNo(String orderNo) {
+	    this.orderNo = orderNo;
+	    return this;
+	}
+
+	public String getOrderNo() {
+	    return this.orderNo;
+	}
+	public VideoLessonPurchaseRecord setOrderStatus(Integer orderStatus) {
+	    this.orderStatus = orderStatus;
+	    return this;
+	}
+
+	public Integer getOrderStatus() {
+	    return this.orderStatus;
+	}
+
+	public int pageNo;
+    public int pageSize;
+    public String search;
+
+    public String getSearch() {
+        return search;
     }
 
-    public void setPayMoney(BigDecimal payMoney) {
-        this.payMoney = payMoney;
+    public void setSearch(String search) {
+        this.search = search;
     }
 
-    public String getOrderNo() {
-        return orderNo;
+    public int getPageNo() {
+        return pageNo;
     }
 
-    public void setOrderNo(String orderNo) {
-        this.orderNo = orderNo;
+    public void setPageNo(int pageNo) {
+        this.pageNo = pageNo;
     }
 
-    public Byte getOrderStatus() {
-        return orderStatus;
+    public int getPageSize() {
+        return pageSize;
     }
 
-    public void setOrderStatus(Byte orderStatus) {
-        this.orderStatus = orderStatus;
+    public void setPageSize(int pageSize) {
+        this.pageSize = pageSize;
     }
 
     @Override
     public String toString() {
-        return "VideoLessonPurchaseRecord{" +
-				"id=" + id +
-						",videoLessonGroupId='" + videoLessonGroupId + "'" + 
-						",studentId='" + studentId + "'" + 
-						",purchaseTime='" + purchaseTime + "'" + 
-						",payMoney='" + payMoney + "'" + 
-						",orderNo='" + orderNo + "'" + 
-						",orderStatus='" + orderStatus + "'" + 
-		                '}';
+        return ToStringBuilder.reflectionToString(this);
     }
-	
+
 }

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

@@ -1,135 +1,140 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.yonge.cooleshow.common.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 视频课学习记录表
- */
-@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.AUTO)
-    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;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
+ * @author yzp
+ * @date 2022-03-22 17:55:57
+ * @version v1.0
+ **/
+@ApiModel(value = "video_lesson_study_record-视频课学习记录表")
+public class VideoLessonStudyRecord extends BaseEntity {
 
-    public Long getVideoLessonGroupId() {
-        return videoLessonGroupId;
-    }
-
-    public void setVideoLessonGroupId(Long videoLessonGroupId) {
-        this.videoLessonGroupId = videoLessonGroupId;
-    }
-
-    public Long getVideoId() {
-        return videoId;
-    }
-
-    public void setVideoId(Long videoId) {
-        this.videoId = videoId;
-    }
-
-    public Long getStudentId() {
-        return studentId;
-    }
-
-    public void setStudentId(Long studentId) {
-        this.studentId = studentId;
-    }
-
-    public Byte getFinishFlag() {
-        return finishFlag;
+    @TableId(value = "id_", type = IdType.AUTO)
+    @ApiModelProperty(value = "主键id")
+    private Long id;  //主键ID
+
+    @TableField("video_lesson_group_id_")
+    @ApiModelProperty(value = "视频课组ID")
+    private Long videoLessonGroupId;  //视频课组ID
+
+    @TableField("video_id_")
+    @ApiModelProperty(value = "视频ID")
+    private Long videoId;  //视频ID
+
+    @TableField("student_id_")
+    @ApiModelProperty(value = "学生ID")
+    private Long studentId;  //学生ID
+
+    @TableField("finish_flag_")
+    @ApiModelProperty(value = "是否学完(1:是;0:否)")
+    private Integer finishFlag;  //是否学完(1:是;0:否)
+
+    @TableField("start_time_")
+    @ApiModelProperty(value = "学习开始时间")
+    private Date startTime;  //学习开始时间
+
+    @TableField("finish_time_")
+    @ApiModelProperty(value = "学习完成时间")
+    private Date finishTime;  //学习完成时间
+
+
+	public VideoLessonStudyRecord setId(Long id) {
+	    this.id = id;
+	    return this;
+	}
+
+	public Long getId() {
+	    return this.id;
+	}
+	public VideoLessonStudyRecord setVideoLessonGroupId(Long videoLessonGroupId) {
+	    this.videoLessonGroupId = videoLessonGroupId;
+	    return this;
+	}
+
+	public Long getVideoLessonGroupId() {
+	    return this.videoLessonGroupId;
+	}
+	public VideoLessonStudyRecord setVideoId(Long videoId) {
+	    this.videoId = videoId;
+	    return this;
+	}
+
+	public Long getVideoId() {
+	    return this.videoId;
+	}
+	public VideoLessonStudyRecord setStudentId(Long studentId) {
+	    this.studentId = studentId;
+	    return this;
+	}
+
+	public Long getStudentId() {
+	    return this.studentId;
+	}
+	public VideoLessonStudyRecord setFinishFlag(Integer finishFlag) {
+	    this.finishFlag = finishFlag;
+	    return this;
+	}
+
+	public Integer getFinishFlag() {
+	    return this.finishFlag;
+	}
+	public VideoLessonStudyRecord setStartTime(Date startTime) {
+	    this.startTime = startTime;
+	    return this;
+	}
+
+	public Date getStartTime() {
+	    return this.startTime;
+	}
+	public VideoLessonStudyRecord setFinishTime(Date finishTime) {
+	    this.finishTime = finishTime;
+	    return this;
+	}
+
+	public Date getFinishTime() {
+	    return this.finishTime;
+	}
+
+	public int pageNo;
+    public int pageSize;
+    public String search;
+
+    public String getSearch() {
+        return search;
     }
 
-    public void setFinishFlag(Byte finishFlag) {
-        this.finishFlag = finishFlag;
+    public void setSearch(String search) {
+        this.search = search;
     }
 
-    public Date getStartTime() {
-        return startTime;
+    public int getPageNo() {
+        return pageNo;
     }
 
-    public void setStartTime(Date startTime) {
-        this.startTime = startTime;
+    public void setPageNo(int pageNo) {
+        this.pageNo = pageNo;
     }
 
-    public Date getFinishTime() {
-        return finishTime;
+    public int getPageSize() {
+        return pageSize;
     }
 
-    public void setFinishTime(Date finishTime) {
-        this.finishTime = finishTime;
+    public void setPageSize(int pageSize) {
+        this.pageSize = pageSize;
     }
 
     @Override
     public String toString() {
-        return "VideoLessonStudyRecord{" +
-				"id=" + id +
-						",videoLessonGroupId='" + videoLessonGroupId + "'" + 
-						",videoId='" + videoId + "'" + 
-						",studentId='" + studentId + "'" + 
-						",finishFlag='" + finishFlag + "'" + 
-						",startTime='" + startTime + "'" + 
-						",finishTime='" + finishTime + "'" + 
-		                '}';
+        return ToStringBuilder.reflectionToString(this);
     }
-	
+
 }

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

@@ -1,21 +1,14 @@
 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;
 
 /**
- * 专辑收藏表 服务类
+ * AlbumFavoriteService服务类
  * @author yzp
- * @date 2022-03-18
- */
-public interface AlbumFavoriteService extends IService<AlbumFavorite>  {
+ * @date 2022-03-22 16:07:40
+ * @version v1.0
+ **/
+public interface AlbumFavoriteService extends BaseService<Long,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,21 +1,14 @@
 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;
 
 /**
- * 专辑曲谱关联表 服务类
+ * AlbumMusicRelateService服务类
  * @author yzp
- * @date 2022-03-18
- */
-public interface AlbumMusicRelateService extends IService<AlbumMusicRelate>  {
+ * @date 2022-03-22 16:07:40
+ * @version v1.0
+ **/
+public interface AlbumMusicRelateService extends BaseService<Long,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/HolidaysFestivalsService.java

@@ -0,0 +1,10 @@
+package com.yonge.cooleshow.biz.dal.service;
+
+import com.yonge.cooleshow.biz.dal.entity.HolidaysFestivals;
+import com.yonge.cooleshow.common.service.BaseService;
+
+public interface HolidaysFestivalsService extends BaseService<Integer, HolidaysFestivals> {
+
+	HolidaysFestivals queryByYear(int year);
+	
+}

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

@@ -1,21 +1,14 @@
 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;
 
 /**
- * 专辑表 服务类
+ * MusicAlbumService服务类
  * @author yzp
- * @date 2022-03-18
- */
-public interface MusicAlbumService extends IService<MusicAlbum>  {
+ * @date 2022-03-22 16:07:40
+ * @version v1.0
+ **/
+public interface MusicAlbumService extends BaseService<Long,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,21 +1,14 @@
 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;
 
 /**
- * 乐谱收藏表 服务类
+ * MusicFavoriteService服务类
  * @author yzp
- * @date 2022-03-18
- */
-public interface MusicFavoriteService extends IService<MusicFavorite>  {
+ * @date 2022-03-22 16:07:40
+ * @version v1.0
+ **/
+public interface MusicFavoriteService extends BaseService<Long,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,21 +1,14 @@
 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;
 
 /**
- * 曲谱伴奏表 服务类
+ * MusicSheetAccompanimentService服务类
  * @author yzp
- * @date 2022-03-18
- */
-public interface MusicSheetAccompanimentService extends IService<MusicSheetAccompaniment>  {
+ * @date 2022-03-22 16:07:40
+ * @version v1.0
+ **/
+public interface MusicSheetAccompanimentService extends BaseService<Long,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,21 +1,14 @@
 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;
 
 /**
- * 曲谱购买记录表 服务类
+ * MusicSheetPurchaseRecordService服务类
  * @author yzp
- * @date 2022-03-18
- */
-public interface MusicSheetPurchaseRecordService extends IService<MusicSheetPurchaseRecord>  {
+ * @date 2022-03-22 16:07:40
+ * @version v1.0
+ **/
+public interface MusicSheetPurchaseRecordService extends BaseService<Long,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,21 +1,14 @@
 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;
 
 /**
- * 曲谱表 服务类
+ * MusicSheetService服务类
  * @author yzp
- * @date 2022-03-18
- */
-public interface MusicSheetService extends IService<MusicSheet>  {
+ * @date 2022-03-22 16:07:40
+ * @version v1.0
+ **/
+public interface MusicSheetService extends BaseService<Long,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/TeacherAuthEntryRecordService.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dto.req.AuthOperaReq;
 import com.yonge.cooleshow.biz.dal.dto.req.TeacherApplyDetailReq;
-import com.yonge.cooleshow.biz.dal.dto.search.TeacherAuthEntryRecordSearch;
+import com.yonge.cooleshow.biz.dal.dto.search.AuthEntryRecordSearch;
 import com.yonge.cooleshow.biz.dal.entity.TeacherAuthEntryRecord;
 import com.yonge.cooleshow.biz.dal.vo.TeacherAuthEntryRecordVo;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
@@ -21,7 +21,7 @@ public interface TeacherAuthEntryRecordService extends IService<TeacherAuthEntry
      * @author liweifan
  	 * @date 2022-03-18
      */
-    IPage<TeacherAuthEntryRecordVo> selectPage(IPage<TeacherAuthEntryRecordVo> page, TeacherAuthEntryRecordSearch search);
+    IPage<TeacherAuthEntryRecordVo> selectPage(IPage<TeacherAuthEntryRecordVo> page, AuthEntryRecordSearch search);
     /***
      * 老师入驻申请
      * @author liweifan

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

@@ -2,7 +2,11 @@ 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.auth.api.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.dto.req.AuthOperaReq;
+import com.yonge.cooleshow.biz.dal.dto.search.AuthEntryRecordSearch;
 import com.yonge.cooleshow.biz.dal.entity.TeacherAuthMusicianRecord;
+import com.yonge.cooleshow.biz.dal.vo.MusicianAuthEntryRecordVo;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 
 /**
@@ -14,12 +18,19 @@ public interface TeacherAuthMusicianRecordService extends IService<TeacherAuthMu
 
 
     /**
-     * 自定义分页
+     * 自查询分页
      * @author liweifan
  	 * @date 2022-03-18
      */
-    IPage<TeacherAuthMusicianRecord> selectPage(IPage<TeacherAuthMusicianRecord> page, TeacherAuthMusicianRecord teacherAuthMusicianRecord);
-
+    IPage<MusicianAuthEntryRecordVo> selectPage(IPage<MusicianAuthEntryRecordVo> page, AuthEntryRecordSearch authEntryRecordSearch);
+    /***
+     * 查询音乐人审批单详情
+     * @author liweifan
+     * @param: id
+     * @updateTime 2022/3/22 19:57
+     * @return: com.yonge.cooleshow.biz.dal.vo.MusicianAuthEntryRecordVo
+     */
+    MusicianAuthEntryRecordVo detail(Long id);
     /***
      * 获取音乐人认证状态
      * @author liweifan
@@ -36,4 +47,14 @@ public interface TeacherAuthMusicianRecordService extends IService<TeacherAuthMu
      * @return: com.yonge.cooleshow.common.entity.HttpResponseResult<java.lang.Boolean>
      */
     HttpResponseResult<Boolean> doApply(Long id);
+
+    /***
+     * 审核
+     * @author liweifan
+     * @param: authOperaReq
+     * @param: sysUser
+     * @updateTime 2022/3/22 20:06
+     * @return: com.yonge.cooleshow.common.entity.HttpResponseResult<java.lang.Boolean>
+     */
+    HttpResponseResult<Boolean> doAuth(AuthOperaReq authOperaReq, SysUser sysUser);
 }

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.yonge.cooleshow.biz.dal.dto.req.TeacherSetReq;
 import com.yonge.cooleshow.biz.dal.entity.Teacher;
 import com.yonge.cooleshow.biz.dal.vo.TeacherVo;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
 
 /**
  * 教师表 服务类
@@ -36,5 +37,12 @@ public interface TeacherService extends IService<Teacher>  {
      * @updateTime 2022/3/22 11:04
      */
     void submitSetDetail(TeacherSetReq setReq, Long id);
-
+    /***
+     * 开通直播
+     * @author liweifan
+     * @param: setReq
+     * @param: id
+     * @updateTime 2022/3/22 11:04
+     */
+    HttpResponseResult<Boolean> openLive(Long id);
 }

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

@@ -1,21 +1,14 @@
 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;
 
 /**
- * 视频课学员评价 服务类
+ * VideoLessonEvaluateService服务类
  * @author yzp
- * @date 2022-03-18
- */
-public interface VideoLessonEvaluateService extends IService<VideoLessonEvaluate>  {
+ * @date 2022-03-22 16:07:40
+ * @version v1.0
+ **/
+public interface VideoLessonEvaluateService extends BaseService<Long,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,21 +1,14 @@
 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;
 
 /**
- * 视频课明细表 服务类
+ * VideoLessonGroupDetailService服务类
  * @author yzp
- * @date 2022-03-18
- */
-public interface VideoLessonGroupDetailService extends IService<VideoLessonGroupDetail>  {
+ * @date 2022-03-22 16:07:41
+ * @version v1.0
+ **/
+public interface VideoLessonGroupDetailService extends BaseService<Long,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,21 +1,14 @@
 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;
 
 /**
- * 视频课基本信息表 服务类
+ * VideoLessonGroupService服务类
  * @author yzp
- * @date 2022-03-18
- */
-public interface VideoLessonGroupService extends IService<VideoLessonGroup>  {
+ * @date 2022-03-22 16:07:40
+ * @version v1.0
+ **/
+public interface VideoLessonGroupService extends BaseService<Long,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,21 +1,14 @@
 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;
 
 /**
- * 视频课购买记录表 服务类
+ * VideoLessonPurchaseRecordService服务类
  * @author yzp
- * @date 2022-03-18
- */
-public interface VideoLessonPurchaseRecordService extends IService<VideoLessonPurchaseRecord>  {
+ * @date 2022-03-22 16:07:41
+ * @version v1.0
+ **/
+public interface VideoLessonPurchaseRecordService extends BaseService<Long,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,21 +1,14 @@
 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;
 
 /**
- * 视频课学习记录表 服务类
+ * VideoLessonStudyRecordService服务类
  * @author yzp
- * @date 2022-03-18
- */
-public interface VideoLessonStudyRecordService extends IService<VideoLessonStudyRecord>  {
+ * @date 2022-03-22 16:07:41
+ * @version v1.0
+ **/
+public interface VideoLessonStudyRecordService extends BaseService<Long,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,22 +1,27 @@
 package com.yonge.cooleshow.biz.dal.service.impl;
 
-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.dao.AlbumFavoriteDao;
 import com.yonge.cooleshow.biz.dal.service.AlbumFavoriteService;
+import com.yonge.cooleshow.common.dal.BaseDAO;
+import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
+import com.yonge.cooleshow.common.dal.BaseDAO;
 
-
+/**
+ * AlbumFavoriteService服务实现类
+ * @author yzp
+ * @date 2022-03-22 18:03:01
+ * @version v1.0
+ **/
 @Service
-public class AlbumFavoriteServiceImpl extends ServiceImpl<AlbumFavoriteDao, AlbumFavorite> implements AlbumFavoriteService {
+public class AlbumFavoriteServiceImpl extends BaseServiceImpl<Long,AlbumFavorite> implements AlbumFavoriteService {
+    @Autowired
+    private AlbumFavoriteDao albumFavoriteDao;
 
-    /**
-     * 分页查询
-     */
-     @Override
-    public IPage<AlbumFavorite> selectPage(IPage<AlbumFavorite> page, AlbumFavorite albumFavorite){
-        return page.setRecords(baseMapper.selectPage(page, albumFavorite));
+    @Override
+    public BaseDAO<Long, AlbumFavorite> getDAO() {
+        return albumFavoriteDao;
     }
-	
 }

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

@@ -1,22 +1,27 @@
 package com.yonge.cooleshow.biz.dal.service.impl;
 
-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.dao.AlbumMusicRelateDao;
 import com.yonge.cooleshow.biz.dal.service.AlbumMusicRelateService;
+import com.yonge.cooleshow.common.dal.BaseDAO;
+import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
+import com.yonge.cooleshow.common.dal.BaseDAO;
 
-
+/**
+ * AlbumMusicRelateService服务实现类
+ * @author yzp
+ * @date 2022-03-22 18:03:02
+ * @version v1.0
+ **/
 @Service
-public class AlbumMusicRelateServiceImpl extends ServiceImpl<AlbumMusicRelateDao, AlbumMusicRelate> implements AlbumMusicRelateService {
+public class AlbumMusicRelateServiceImpl extends BaseServiceImpl<Long,AlbumMusicRelate> implements AlbumMusicRelateService {
+    @Autowired
+    private AlbumMusicRelateDao albumMusicRelateDao;
 
-    /**
-     * 分页查询
-     */
-     @Override
-    public IPage<AlbumMusicRelate> selectPage(IPage<AlbumMusicRelate> page, AlbumMusicRelate albumMusicRelate){
-        return page.setRecords(baseMapper.selectPage(page, albumMusicRelate));
+    @Override
+    public BaseDAO<Long, AlbumMusicRelate> getDAO() {
+        return albumMusicRelateDao;
     }
-	
 }

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

@@ -0,0 +1,28 @@
+package com.yonge.cooleshow.biz.dal.service.impl;
+
+import com.yonge.cooleshow.common.dal.BaseDAO;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+import com.yonge.cooleshow.biz.dal.entity.HolidaysFestivals;
+import com.yonge.cooleshow.biz.dal.service.HolidaysFestivalsService;
+import com.yonge.cooleshow.biz.dal.dao.HolidaysFestivalsDao;
+
+@Service
+public class HolidaysFestivalsServiceImpl extends BaseServiceImpl<Integer, HolidaysFestivals>  implements HolidaysFestivalsService {
+	
+	@Autowired
+	private HolidaysFestivalsDao holidaysFestivalsDao;
+
+	@Override
+	public BaseDAO<Integer, HolidaysFestivals> getDAO() {
+		return holidaysFestivalsDao;
+	}
+
+	@Override
+	public HolidaysFestivals queryByYear(int year) {
+		return holidaysFestivalsDao.queryByYear(year);
+	}
+	
+}

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

@@ -1,22 +1,27 @@
 package com.yonge.cooleshow.biz.dal.service.impl;
 
-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.dao.MusicAlbumDao;
 import com.yonge.cooleshow.biz.dal.service.MusicAlbumService;
+import com.yonge.cooleshow.common.dal.BaseDAO;
+import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
+import com.yonge.cooleshow.common.dal.BaseDAO;
 
-
+/**
+ * MusicAlbumService服务实现类
+ * @author yzp
+ * @date 2022-03-22 18:03:02
+ * @version v1.0
+ **/
 @Service
-public class MusicAlbumServiceImpl extends ServiceImpl<MusicAlbumDao, MusicAlbum> implements MusicAlbumService {
+public class MusicAlbumServiceImpl extends BaseServiceImpl<Long,MusicAlbum> implements MusicAlbumService {
+    @Autowired
+    private MusicAlbumDao musicAlbumDao;
 
-    /**
-     * 分页查询
-     */
-     @Override
-    public IPage<MusicAlbum> selectPage(IPage<MusicAlbum> page, MusicAlbum musicAlbum){
-        return page.setRecords(baseMapper.selectPage(page, musicAlbum));
+    @Override
+    public BaseDAO<Long, MusicAlbum> getDAO() {
+        return musicAlbumDao;
     }
-	
 }

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

@@ -1,22 +1,26 @@
 package com.yonge.cooleshow.biz.dal.service.impl;
 
-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.dao.MusicFavoriteDao;
 import com.yonge.cooleshow.biz.dal.service.MusicFavoriteService;
+import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
+import com.yonge.cooleshow.common.dal.BaseDAO;
 
-
+/**
+ * MusicFavoriteService服务实现类
+ * @author yzp
+ * @date 2022-03-22 18:03:02
+ * @version v1.0
+ **/
 @Service
-public class MusicFavoriteServiceImpl extends ServiceImpl<MusicFavoriteDao, MusicFavorite> implements MusicFavoriteService {
+public class MusicFavoriteServiceImpl extends BaseServiceImpl<Long,MusicFavorite> implements MusicFavoriteService {
+    @Autowired
+    private MusicFavoriteDao musicFavoriteDao;
 
-    /**
-     * 分页查询
-     */
-     @Override
-    public IPage<MusicFavorite> selectPage(IPage<MusicFavorite> page, MusicFavorite musicFavorite){
-        return page.setRecords(baseMapper.selectPage(page, musicFavorite));
+    @Override
+    public BaseDAO<Long, MusicFavorite> getDAO() {
+        return musicFavoriteDao;
     }
-	
 }

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

@@ -1,22 +1,27 @@
 package com.yonge.cooleshow.biz.dal.service.impl;
 
-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.dao.MusicSheetAccompanimentDao;
 import com.yonge.cooleshow.biz.dal.service.MusicSheetAccompanimentService;
+import com.yonge.cooleshow.common.dal.BaseDAO;
+import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
+import com.yonge.cooleshow.common.dal.BaseDAO;
 
-
+/**
+ * MusicSheetAccompanimentService服务实现类
+ * @author yzp
+ * @date 2022-03-22 18:03:02
+ * @version v1.0
+ **/
 @Service
-public class MusicSheetAccompanimentServiceImpl extends ServiceImpl<MusicSheetAccompanimentDao, MusicSheetAccompaniment> implements MusicSheetAccompanimentService {
+public class MusicSheetAccompanimentServiceImpl extends BaseServiceImpl<Long,MusicSheetAccompaniment> implements MusicSheetAccompanimentService {
+    @Autowired
+    private MusicSheetAccompanimentDao musicSheetAccompanimentDao;
 
-    /**
-     * 分页查询
-     */
-     @Override
-    public IPage<MusicSheetAccompaniment> selectPage(IPage<MusicSheetAccompaniment> page, MusicSheetAccompaniment musicSheetAccompaniment){
-        return page.setRecords(baseMapper.selectPage(page, musicSheetAccompaniment));
+    @Override
+    public BaseDAO<Long, MusicSheetAccompaniment> getDAO() {
+        return musicSheetAccompanimentDao;
     }
-	
 }

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

@@ -1,22 +1,26 @@
 package com.yonge.cooleshow.biz.dal.service.impl;
 
-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.dao.MusicSheetPurchaseRecordDao;
 import com.yonge.cooleshow.biz.dal.service.MusicSheetPurchaseRecordService;
+import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
+import com.yonge.cooleshow.common.dal.BaseDAO;
 
-
+/**
+ * MusicSheetPurchaseRecordService服务实现类
+ * @author yzp
+ * @date 2022-03-22 18:03:02
+ * @version v1.0
+ **/
 @Service
-public class MusicSheetPurchaseRecordServiceImpl extends ServiceImpl<MusicSheetPurchaseRecordDao, MusicSheetPurchaseRecord> implements MusicSheetPurchaseRecordService {
+public class MusicSheetPurchaseRecordServiceImpl extends BaseServiceImpl<Long,MusicSheetPurchaseRecord> implements MusicSheetPurchaseRecordService {
+    @Autowired
+    private MusicSheetPurchaseRecordDao musicSheetPurchaseRecordDao;
 
-    /**
-     * 分页查询
-     */
-     @Override
-    public IPage<MusicSheetPurchaseRecord> selectPage(IPage<MusicSheetPurchaseRecord> page, MusicSheetPurchaseRecord musicSheetPurchaseRecord){
-        return page.setRecords(baseMapper.selectPage(page, musicSheetPurchaseRecord));
+    @Override
+    public BaseDAO<Long, MusicSheetPurchaseRecord> getDAO() {
+        return musicSheetPurchaseRecordDao;
     }
-	
 }

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

@@ -1,22 +1,26 @@
 package com.yonge.cooleshow.biz.dal.service.impl;
 
-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.dao.MusicSheetDao;
 import com.yonge.cooleshow.biz.dal.service.MusicSheetService;
+import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
+import com.yonge.cooleshow.common.dal.BaseDAO;
 
-
+/**
+ * MusicSheetService服务实现类
+ * @author yzp
+ * @date 2022-03-22 18:03:02
+ * @version v1.0
+ **/
 @Service
-public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet> implements MusicSheetService {
+public class MusicSheetServiceImpl extends BaseServiceImpl<Long,MusicSheet> implements MusicSheetService {
+    @Autowired
+    private MusicSheetDao musicSheetDao;
 
-    /**
-     * 分页查询
-     */
-     @Override
-    public IPage<MusicSheet> selectPage(IPage<MusicSheet> page, MusicSheet musicSheet){
-        return page.setRecords(baseMapper.selectPage(page, musicSheet));
+    @Override
+    public BaseDAO<Long, MusicSheet> getDAO() {
+        return musicSheetDao;
     }
-	
 }

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

@@ -7,7 +7,7 @@ import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dao.TeacherDao;
 import com.yonge.cooleshow.biz.dal.dto.req.AuthOperaReq;
 import com.yonge.cooleshow.biz.dal.dto.req.TeacherApplyDetailReq;
-import com.yonge.cooleshow.biz.dal.dto.search.TeacherAuthEntryRecordSearch;
+import com.yonge.cooleshow.biz.dal.dto.search.AuthEntryRecordSearch;
 import com.yonge.cooleshow.biz.dal.entity.Teacher;
 import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 import com.yonge.cooleshow.biz.dal.vo.TeacherAuthEntryRecordVo;
@@ -20,6 +20,8 @@ import com.yonge.cooleshow.biz.dal.dao.TeacherAuthEntryRecordDao;
 import com.yonge.cooleshow.biz.dal.service.TeacherAuthEntryRecordService;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Date;
+
 
 @Service
 public class TeacherAuthEntryRecordServiceImpl extends ServiceImpl<TeacherAuthEntryRecordDao, TeacherAuthEntryRecord> implements TeacherAuthEntryRecordService {
@@ -30,7 +32,7 @@ public class TeacherAuthEntryRecordServiceImpl extends ServiceImpl<TeacherAuthEn
      * 分页查询
      */
     @Override
-    public IPage<TeacherAuthEntryRecordVo> selectPage(IPage<TeacherAuthEntryRecordVo> page, TeacherAuthEntryRecordSearch search) {
+    public IPage<TeacherAuthEntryRecordVo> selectPage(IPage<TeacherAuthEntryRecordVo> page, AuthEntryRecordSearch search) {
         return page.setRecords(baseMapper.selectPage(page, search));
     }
 
@@ -62,11 +64,19 @@ public class TeacherAuthEntryRecordServiceImpl extends ServiceImpl<TeacherAuthEn
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public HttpResponseResult<Boolean> doAuth(AuthOperaReq authOperaReq, SysUser sysUser) {
-        TeacherAuthEntryRecord build = new TeacherAuthEntryRecord();
-        build.setId(authOperaReq.getId());
+        TeacherAuthEntryRecord build = baseMapper.selectById(authOperaReq.getId());
         build.setTeacherAuthStatus(authOperaReq.getPass() ? AuthStatusEnum.PASS.getCode() : AuthStatusEnum.UNPASS.getCode());
         build.setReason(authOperaReq.getReason());
+
+        //修改teacher表
+        Teacher teacher = new Teacher();
+        teacher.setUserId(build.getUserId());
+        teacher.setEntryStatus(build.getTeacherAuthStatus());
+        teacher.setEntryAuthDate(new Date());
+        teacherDao.updateById(teacher);
+
         return HttpResponseResult.succeed(baseMapper.updateById(build) > 0);
     }
 

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

@@ -3,12 +3,16 @@ package com.yonge.cooleshow.biz.dal.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dao.TeacherDao;
+import com.yonge.cooleshow.biz.dal.dto.req.AuthOperaReq;
+import com.yonge.cooleshow.biz.dal.dto.search.AuthEntryRecordSearch;
 import com.yonge.cooleshow.biz.dal.entity.Teacher;
 import com.yonge.cooleshow.biz.dal.entity.TeacherAuthEntryRecord;
 import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 import com.yonge.cooleshow.biz.dal.service.TeacherService;
 import com.yonge.cooleshow.biz.dal.support.Condition;
+import com.yonge.cooleshow.biz.dal.vo.MusicianAuthEntryRecordVo;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -17,6 +21,8 @@ import com.yonge.cooleshow.biz.dal.dao.TeacherAuthMusicianRecordDao;
 import com.yonge.cooleshow.biz.dal.service.TeacherAuthMusicianRecordService;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Date;
+
 
 @Service
 public class TeacherAuthMusicianRecordServiceImpl extends ServiceImpl<TeacherAuthMusicianRecordDao, TeacherAuthMusicianRecord> implements TeacherAuthMusicianRecordService {
@@ -25,12 +31,14 @@ public class TeacherAuthMusicianRecordServiceImpl extends ServiceImpl<TeacherAut
     @Autowired
     private TeacherDao teacherDao;
 
-    /**
-     * 分页查询
-     */
     @Override
-    public IPage<TeacherAuthMusicianRecord> selectPage(IPage<TeacherAuthMusicianRecord> page, TeacherAuthMusicianRecord teacherAuthMusicianRecord) {
-        return page.setRecords(baseMapper.selectPage(page, teacherAuthMusicianRecord));
+    public IPage<MusicianAuthEntryRecordVo> selectPage(IPage<MusicianAuthEntryRecordVo> page, AuthEntryRecordSearch authEntryRecordSearch) {
+        return page.setRecords(baseMapper.selectPage(page, authEntryRecordSearch));
+    }
+
+    @Override
+    public MusicianAuthEntryRecordVo detail(Long id) {
+        return baseMapper.detail(id);
     }
 
     @Override
@@ -59,6 +67,23 @@ public class TeacherAuthMusicianRecordServiceImpl extends ServiceImpl<TeacherAut
         return HttpResponseResult.status(baseMapper.insert(record) > 0);
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public HttpResponseResult<Boolean> doAuth(AuthOperaReq authOperaReq, SysUser sysUser) {
+        TeacherAuthMusicianRecord build = baseMapper.selectById(authOperaReq.getId());
+        build.setTeacherAuthStatus(authOperaReq.getPass() ? AuthStatusEnum.PASS.getCode() : AuthStatusEnum.UNPASS.getCode());
+        build.setReason(authOperaReq.getReason());
+
+        //修改teacher表
+        Teacher teacher = new Teacher();
+        teacher.setUserId(build.getUserId());
+        teacher.setMusicianAuthStatus(build.getTeacherAuthStatus());
+        teacher.setMusicianDate(new Date());
+        teacherDao.updateById(teacher);
+
+        return HttpResponseResult.succeed(baseMapper.updateById(build) > 0);
+    }
+
     /***
      * 判断用户是否已经提交申请
      * @author liweifan

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

@@ -6,6 +6,7 @@ import com.yonge.cooleshow.biz.dal.dao.SubjectDao;
 import com.yonge.cooleshow.biz.dal.dto.req.TeacherSetReq;
 import com.yonge.cooleshow.biz.dal.entity.Subject;
 import com.yonge.cooleshow.biz.dal.vo.TeacherVo;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.yonge.cooleshow.biz.dal.entity.Teacher;
@@ -36,4 +37,16 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
         baseMapper.updatetSetDetail(setReq, id);
     }
 
+    @Override
+    public HttpResponseResult<Boolean> openLive(Long id) {
+        //todo 根据老师规则，判断老师直播权限
+        if(true){
+            Teacher teacher = new Teacher();
+            teacher.setUserId(id);
+            teacher.setLiveFlag(1);
+            baseMapper.updateById(teacher);
+        }
+        return HttpResponseResult.status(true);
+    }
+
 }

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

@@ -1,22 +1,27 @@
 package com.yonge.cooleshow.biz.dal.service.impl;
 
-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.dao.VideoLessonEvaluateDao;
 import com.yonge.cooleshow.biz.dal.service.VideoLessonEvaluateService;
+import com.yonge.cooleshow.common.dal.BaseDAO;
+import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
+import com.yonge.cooleshow.common.dal.BaseDAO;
 
-
+/**
+ * VideoLessonEvaluateService服务实现类
+ * @author yzp
+ * @date 2022-03-22 18:03:02
+ * @version v1.0
+ **/
 @Service
-public class VideoLessonEvaluateServiceImpl extends ServiceImpl<VideoLessonEvaluateDao, VideoLessonEvaluate> implements VideoLessonEvaluateService {
+public class VideoLessonEvaluateServiceImpl extends BaseServiceImpl<Long,VideoLessonEvaluate> implements VideoLessonEvaluateService {
+    @Autowired
+    private VideoLessonEvaluateDao videoLessonEvaluateDao;
 
-    /**
-     * 分页查询
-     */
-     @Override
-    public IPage<VideoLessonEvaluate> selectPage(IPage<VideoLessonEvaluate> page, VideoLessonEvaluate videoLessonEvaluate){
-        return page.setRecords(baseMapper.selectPage(page, videoLessonEvaluate));
+    @Override
+    public BaseDAO<Long, VideoLessonEvaluate> getDAO() {
+        return videoLessonEvaluateDao;
     }
-	
 }

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

@@ -1,22 +1,26 @@
 package com.yonge.cooleshow.biz.dal.service.impl;
 
-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.dao.VideoLessonGroupDetailDao;
 import com.yonge.cooleshow.biz.dal.service.VideoLessonGroupDetailService;
+import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
+import com.yonge.cooleshow.common.dal.BaseDAO;
 
-
+/**
+ * VideoLessonGroupDetailService服务实现类
+ * @author yzp
+ * @date 2022-03-22 18:03:02
+ * @version v1.0
+ **/
 @Service
-public class VideoLessonGroupDetailServiceImpl extends ServiceImpl<VideoLessonGroupDetailDao, VideoLessonGroupDetail> implements VideoLessonGroupDetailService {
+public class VideoLessonGroupDetailServiceImpl extends BaseServiceImpl<Long,VideoLessonGroupDetail> implements VideoLessonGroupDetailService {
+    @Autowired
+    private VideoLessonGroupDetailDao videoLessonGroupDetailDao;
 
-    /**
-     * 分页查询
-     */
-     @Override
-    public IPage<VideoLessonGroupDetail> selectPage(IPage<VideoLessonGroupDetail> page, VideoLessonGroupDetail videoLessonGroupDetail){
-        return page.setRecords(baseMapper.selectPage(page, videoLessonGroupDetail));
+    @Override
+    public BaseDAO<Long, VideoLessonGroupDetail> getDAO() {
+        return videoLessonGroupDetailDao;
     }
-	
 }

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

@@ -1,22 +1,26 @@
 package com.yonge.cooleshow.biz.dal.service.impl;
 
-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.dao.VideoLessonGroupDao;
 import com.yonge.cooleshow.biz.dal.service.VideoLessonGroupService;
+import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
+import com.yonge.cooleshow.common.dal.BaseDAO;
 
-
+/**
+ * VideoLessonGroupService服务实现类
+ * @author yzp
+ * @date 2022-03-22 18:03:02
+ * @version v1.0
+ **/
 @Service
-public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao, VideoLessonGroup> implements VideoLessonGroupService {
+public class VideoLessonGroupServiceImpl extends BaseServiceImpl<Long,VideoLessonGroup> implements VideoLessonGroupService {
+    @Autowired
+    private VideoLessonGroupDao videoLessonGroupDao;
 
-    /**
-     * 分页查询
-     */
-     @Override
-    public IPage<VideoLessonGroup> selectPage(IPage<VideoLessonGroup> page, VideoLessonGroup videoLessonGroup){
-        return page.setRecords(baseMapper.selectPage(page, videoLessonGroup));
+    @Override
+    public BaseDAO<Long, VideoLessonGroup> getDAO() {
+        return videoLessonGroupDao;
     }
-	
 }

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

@@ -1,22 +1,26 @@
 package com.yonge.cooleshow.biz.dal.service.impl;
 
-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.dao.VideoLessonPurchaseRecordDao;
 import com.yonge.cooleshow.biz.dal.service.VideoLessonPurchaseRecordService;
+import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
+import com.yonge.cooleshow.common.dal.BaseDAO;
 
-
+/**
+ * VideoLessonPurchaseRecordService服务实现类
+ * @author yzp
+ * @date 2022-03-22 18:03:02
+ * @version v1.0
+ **/
 @Service
-public class VideoLessonPurchaseRecordServiceImpl extends ServiceImpl<VideoLessonPurchaseRecordDao, VideoLessonPurchaseRecord> implements VideoLessonPurchaseRecordService {
+public class VideoLessonPurchaseRecordServiceImpl extends BaseServiceImpl<Long,VideoLessonPurchaseRecord> implements VideoLessonPurchaseRecordService {
+    @Autowired
+    private VideoLessonPurchaseRecordDao videoLessonPurchaseRecordDao;
 
-    /**
-     * 分页查询
-     */
-     @Override
-    public IPage<VideoLessonPurchaseRecord> selectPage(IPage<VideoLessonPurchaseRecord> page, VideoLessonPurchaseRecord videoLessonPurchaseRecord){
-        return page.setRecords(baseMapper.selectPage(page, videoLessonPurchaseRecord));
+    @Override
+    public BaseDAO<Long, VideoLessonPurchaseRecord> getDAO() {
+        return videoLessonPurchaseRecordDao;
     }
-	
 }

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

@@ -1,22 +1,26 @@
 package com.yonge.cooleshow.biz.dal.service.impl;
 
-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.dao.VideoLessonStudyRecordDao;
 import com.yonge.cooleshow.biz.dal.service.VideoLessonStudyRecordService;
+import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
+import com.yonge.cooleshow.common.dal.BaseDAO;
 
-
+/**
+ * VideoLessonStudyRecordService服务实现类
+ * @author yzp
+ * @date 2022-03-22 18:03:02
+ * @version v1.0
+ **/
 @Service
-public class VideoLessonStudyRecordServiceImpl extends ServiceImpl<VideoLessonStudyRecordDao, VideoLessonStudyRecord> implements VideoLessonStudyRecordService {
+public class VideoLessonStudyRecordServiceImpl extends BaseServiceImpl<Long,VideoLessonStudyRecord> implements VideoLessonStudyRecordService {
+    @Autowired
+    private VideoLessonStudyRecordDao videoLessonStudyRecordDao;
 
-    /**
-     * 分页查询
-     */
-     @Override
-    public IPage<VideoLessonStudyRecord> selectPage(IPage<VideoLessonStudyRecord> page, VideoLessonStudyRecord videoLessonStudyRecord){
-        return page.setRecords(baseMapper.selectPage(page, videoLessonStudyRecord));
+    @Override
+    public BaseDAO<Long, VideoLessonStudyRecord> getDAO() {
+        return videoLessonStudyRecordDao;
     }
-	
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/MusicianAuthEntryRecordVo.java

@@ -0,0 +1,57 @@
+package com.yonge.cooleshow.biz.dal.vo;
+
+import com.yonge.cooleshow.biz.dal.entity.TeacherAuthMusicianRecord;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022/3/21 13:34
+ */
+@ApiModel(value = "TeacherAuthEntryRecordVo对象", description = "老师入驻审核详情")
+public class MusicianAuthEntryRecordVo extends TeacherAuthMusicianRecord {
+
+    @ApiModelProperty(value = "真实姓名")
+    private String realName;
+
+    @ApiModelProperty(value = "身份证号")
+    private String idCardNo;
+
+    @ApiModelProperty("手机号 ")
+    private String phone;
+
+    @ApiModelProperty("审核人 ")
+    private String verifyUser;
+
+    public String getRealName() {
+        return realName;
+    }
+
+    public void setRealName(String realName) {
+        this.realName = realName;
+    }
+
+    public String getIdCardNo() {
+        return idCardNo;
+    }
+
+    public void setIdCardNo(String idCardNo) {
+        this.idCardNo = idCardNo;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getVerifyUser() {
+        return verifyUser;
+    }
+
+    public void setVerifyUser(String verifyUser) {
+        this.verifyUser = verifyUser;
+    }
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/TeacherHomeVo.java

@@ -1,9 +1,13 @@
 package com.yonge.cooleshow.biz.dal.vo;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yonge.cooleshow.biz.dal.entity.Teacher;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
 
 /**
  * @Author: liweifan
@@ -11,6 +15,8 @@ import io.swagger.annotations.ApiModelProperty;
  */
 @ApiModel(value = "TeacherHomeVo对象", description = "老师主页基本信息返回")
 public class TeacherHomeVo {
+    @ApiModelProperty("对应user表用户编号")
+    private Long userId;
     @ApiModelProperty("头像地址")
     private String heardUrl;
     @ApiModelProperty("老师姓名")
@@ -25,6 +31,18 @@ public class TeacherHomeVo {
     private Integer unExpTime;
     @ApiModelProperty("老师入驻状态  1、审核中 2、通过 3、不通过 ")
     private Integer entryStatus;
+    @ApiModelProperty("音乐人审核状态  1、审核中 2、通过 3、不通过 ")
+    private Integer musicianAuthStatus;
+    @ApiModelProperty("是否有直播权限 0 否 1 是")
+    private Integer liveFlag;
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
 
     public String getHeardUrl() {
         return heardUrl;
@@ -81,4 +99,20 @@ public class TeacherHomeVo {
     public void setEntryStatus(Integer entryStatus) {
         this.entryStatus = entryStatus;
     }
+
+    public Integer getMusicianAuthStatus() {
+        return musicianAuthStatus;
+    }
+
+    public void setMusicianAuthStatus(Integer musicianAuthStatus) {
+        this.musicianAuthStatus = musicianAuthStatus;
+    }
+
+    public Integer getLiveFlag() {
+        return liveFlag;
+    }
+
+    public void setLiveFlag(Integer liveFlag) {
+        this.liveFlag = liveFlag;
+    }
 }

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

@@ -1,27 +1,97 @@
-<?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" >
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yonge.cooleshow.biz.dal.dao.AlbumFavoriteDao">
+
 	<resultMap 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
+	     <id column="id_" jdbcType="BIGINT" property="id" />
+		 <result column="user_id_" jdbcType="BIGINT" property="userId" />
+		 <result column="album_id_" jdbcType="BIGINT" property="albumId" />
+		 <result column="favorite_time_" jdbcType="TIMESTAMP" property="favoriteTime" />
+		 <result column="favorite_flag_" jdbcType="TINYINT" property="favoriteFlag" />
+	</resultMap>
+
+	<sql id="Base_Column_List">
+		id_, user_id_, album_id_, favorite_time_, favorite_flag_
+	</sql>
+
+	<select id="get" parameterType="Long" resultMap="BaseResultMap">
+		 select
+		 <include refid="Base_Column_List" />
+		 from album_favorite
+		 where id_ = #{id}
 	</select>
+
+	<delete id="delete" parameterType="Long">
+		 delete from album_favorite
+		 where id_ = #{id}
+	</delete>
+	
+	<delete id="delete" parameterType="com.yonge.cooleshow.biz.dal.entity.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="com.yonge.cooleshow.biz.dal.entity.AlbumFavorite">
+		 insert into album_favorite
+ 		 (user_id_,album_id_,favorite_time_,favorite_flag_)
+		 values 
+ 		 (#{userId},#{albumId},#{favoriteTime},#{favoriteFlag})
+	</insert>
+	
+	<update id="update" parameterType="com.yonge.cooleshow.biz.dal.entity.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="findAll" resultMap="BaseResultMap">
+        SELECT * FROM album_favorite
+        ORDER BY id_ desc
+    </select>
+
+	<select id="findList" parameterType="com.yonge.cooleshow.biz.dal.entity.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>
+
 </mapper>

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

@@ -1,29 +1,107 @@
-<?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" >
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yonge.cooleshow.biz.dal.dao.AlbumMusicRelateDao">
+
 	<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
+	     <id column="id_" jdbcType="BIGINT" property="id" />
+		 <result column="album_id_" jdbcType="BIGINT" property="albumId" />
+		 <result column="music_sheet_id_" jdbcType="BIGINT" property="musicSheetId" />
+		 <result column="sort_number_" jdbcType="TINYINT" property="sortNumber" />
+		 <result column="create_time_" jdbcType="TIMESTAMP" property="createTime" />
+		 <result column="create_by_" jdbcType="BIGINT" property="createBy" />
+	</resultMap>
+
+	<sql id="Base_Column_List">
+		id_, album_id_, music_sheet_id_, sort_number_, create_time_, create_by_
+	</sql>
+
+	<select id="get" parameterType="Long" resultMap="BaseResultMap">
+		 select
+		 <include refid="Base_Column_List" />
+		 from album_music_relate
+		 where id_ = #{id}
 	</select>
+
+	<delete id="delete" parameterType="Long">
+		 delete from album_music_relate
+		 where id_ = #{id}
+	</delete>
+	
+	<delete id="delete" parameterType="com.yonge.cooleshow.biz.dal.entity.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="com.yonge.cooleshow.biz.dal.entity.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="com.yonge.cooleshow.biz.dal.entity.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="findAll" resultMap="BaseResultMap">
+        SELECT * FROM album_music_relate
+        ORDER BY id_ desc
+    </select>
+
+	<select id="findList" parameterType="com.yonge.cooleshow.biz.dal.entity.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>
+
 </mapper>

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

@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!-- 这个文件是自动生成的。 不要修改此文件。所有改动将在下次重新自动生成时丢失。 -->
+<mapper namespace="com.yonge.cooleshow.biz.dal.dao.HolidaysFestivalsDao">
+
+	<resultMap type="com.yonge.cooleshow.biz.dal.entity.HolidaysFestivals"
+		id="BaseResultMap">
+		<result column="id_" property="id" />
+		<result column="year_" property="year" />
+		<result column="holidays_festivals_json_" property="holidaysFestivalsJson" />
+		<result column="create_time_" property="createTime" />
+		<result column="update_time_" property="updateTime" />
+		<result column="create_by_" property="createBy" />
+		<result column="update_by_" property="updateBy" />
+	</resultMap>
+
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="BaseResultMap">
+		SELECT * FROM
+		holidays_festivals WHERE id_ = #{id}
+	</select>
+
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="BaseResultMap">
+		SELECT * FROM holidays_festivals
+		ORDER BY id_
+	</select>
+
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert"
+		parameterType="com.yonge.cooleshow.biz.dal.entity.HolidaysFestivals"
+		useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+		INSERT INTO
+		holidays_festivals
+		(id_,year_,holidays_festivals_json_,create_time_,update_time_,create_by_,update_by_)
+		VALUES(#{id},#{year},#{holidaysFestivalsJson},#{createTime},#{updateTime},#{createBy},#{updateBy})
+	</insert>
+
+	<!-- 根据主键查询一条记录 -->
+	<update id="update"
+		parameterType="com.yonge.cooleshow.biz.dal.entity.HolidaysFestivals">
+		UPDATE holidays_festivals
+		<set>
+			<if test="updateBy != null">
+				update_by_ = #{updateBy},
+			</if>
+			<if test="createBy != null">
+				create_by_ = #{createBy},
+			</if>
+			<if test="id != null">
+				id_ = #{id},
+			</if>
+			<if test="updateTime != null">
+				update_time_ = #{updateTime},
+			</if>
+			<if test="holidaysFestivalsJson != null">
+				holidays_festivals_json_ = #{holidaysFestivalsJson},
+			</if>
+			<if test="year != null">
+				year_ = #{year},
+			</if>
+			<if test="createTime != null">
+				create_time_ = #{createTime},
+			</if>
+		</set>
+		WHERE id_ = #{id}
+	</update>
+
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete">
+		DELETE FROM holidays_festivals WHERE id_ = #{id}
+	</delete>
+
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="BaseResultMap" parameterType="map">
+		SELECT * FROM holidays_festivals ORDER BY id_
+		<include refid="global.limit" />
+	</select>
+
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM holidays_festivals
+	</select>
+	
+	<select id="queryByYear" resultMap="BaseResultMap">
+		SELECT * FROM holidays_festivals where year_ = #{year}
+	</select>
+</mapper>

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

@@ -1,43 +1,177 @@
-<?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" >
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yonge.cooleshow.biz.dal.dao.MusicAlbumDao">
+
 	<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
+	     <id column="id_" jdbcType="BIGINT" property="id" />
+		 <result column="album_name_" jdbcType="VARCHAR" property="albumName" />
+		 <result column="album_desc_" jdbcType="VARCHAR" property="albumDesc" />
+		 <result column="album_tag_" jdbcType="VARCHAR" property="albumTag" />
+		 <result column="album_cover_url_" jdbcType="VARCHAR" property="albumCoverUrl" />
+		 <result column="album_status_" jdbcType="TINYINT" property="albumStatus" />
+		 <result column="sort_number_" jdbcType="INTEGER" property="sortNumber" />
+		 <result column="hot_flag_" jdbcType="TINYINT" property="hotFlag" />
+		 <result column="top_flag_" jdbcType="TINYINT" property="topFlag" />
+		 <result column="create_time_" jdbcType="TIMESTAMP" property="createTime" />
+		 <result column="create_by_" jdbcType="BIGINT" property="createBy" />
+		 <result column="update_time_" jdbcType="TIMESTAMP" property="updateTime" />
+		 <result column="update_by_" jdbcType="BIGINT" property="updateBy" />
+	</resultMap>
+
+	<sql id="Base_Column_List">
+		id_, 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_
+	</sql>
+
+	<select id="get" parameterType="Long" resultMap="BaseResultMap">
+		 select
+		 <include refid="Base_Column_List" />
+		 from music_album
+		 where id_ = #{id}
 	</select>
+
+	<delete id="delete" parameterType="Long">
+		 delete from music_album
+		 where id_ = #{id}
+	</delete>
+	
+	<delete id="delete" parameterType="com.yonge.cooleshow.biz.dal.entity.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="com.yonge.cooleshow.biz.dal.entity.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="com.yonge.cooleshow.biz.dal.entity.MusicAlbum">
+		 update music_album
+ 		 <set>
+				 	<if test="albumName != null and albumName != ''">
+						 album_name_ = #{albumName},
+					</if>
+				 	<if test="albumDesc != null and albumDesc != ''">
+						 album_desc_ = #{albumDesc},
+					</if>
+				 	<if test="albumTag != null and albumTag != ''">
+						 album_tag_ = #{albumTag},
+					</if>
+				 	<if test="albumCoverUrl != null and albumCoverUrl != ''">
+						 album_cover_url_ = #{albumCoverUrl},
+					</if>
+		 	   		<if test="albumStatus != null">
+		 	   			 album_status_ = #{albumStatus},
+					</if>
+		 	   		<if test="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="findAll" resultMap="BaseResultMap">
+        SELECT * FROM music_album
+        ORDER BY id_ desc
+    </select>
+
+	<select id="findList" parameterType="com.yonge.cooleshow.biz.dal.entity.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>
+
 </mapper>

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

@@ -1,27 +1,97 @@
-<?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" >
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yonge.cooleshow.biz.dal.dao.MusicFavoriteDao">
+
 	<resultMap 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
+	     <id column="id_" jdbcType="BIGINT" property="id" />
+		 <result column="user_id_" jdbcType="BIGINT" property="userId" />
+		 <result column="music_sheet_id_" jdbcType="BIGINT" property="musicSheetId" />
+		 <result column="favorite_time_" jdbcType="TIMESTAMP" property="favoriteTime" />
+		 <result column="favorite_flag_" jdbcType="TINYINT" property="favoriteFlag" />
+	</resultMap>
+
+	<sql id="Base_Column_List">
+		id_, user_id_, music_sheet_id_, favorite_time_, favorite_flag_
+	</sql>
+
+	<select id="get" parameterType="Long" resultMap="BaseResultMap">
+		 select
+		 <include refid="Base_Column_List" />
+		 from music_favorite
+		 where id_ = #{id}
 	</select>
+
+	<delete id="delete" parameterType="Long">
+		 delete from music_favorite
+		 where id_ = #{id}
+	</delete>
+	
+	<delete id="delete" parameterType="com.yonge.cooleshow.biz.dal.entity.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="com.yonge.cooleshow.biz.dal.entity.MusicFavorite">
+		 insert into music_favorite
+ 		 (user_id_,music_sheet_id_,favorite_time_,favorite_flag_)
+		 values 
+ 		 (#{userId},#{musicSheetId},#{favoriteTime},#{favoriteFlag})
+	</insert>
+	
+	<update id="update" parameterType="com.yonge.cooleshow.biz.dal.entity.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="findAll" resultMap="BaseResultMap">
+        SELECT * FROM music_favorite
+        ORDER BY id_ desc
+    </select>
+
+	<select id="findList" parameterType="com.yonge.cooleshow.biz.dal.entity.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>
+
 </mapper>

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

@@ -1,31 +1,117 @@
-<?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" >
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yonge.cooleshow.biz.dal.dao.MusicSheetAccompanimentDao">
+
 	<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
+	     <id column="id_" jdbcType="BIGINT" property="id" />
+		 <result column="music_sheet_id_" jdbcType="BIGINT" property="musicSheetId" />
+		 <result column="music_subject_" jdbcType="VARCHAR" property="musicSubject" />
+		 <result column="audio_file_url_" jdbcType="VARCHAR" property="audioFileUrl" />
+		 <result column="sort_number_" jdbcType="TINYINT" property="sortNumber" />
+		 <result column="create_time_" jdbcType="TIMESTAMP" property="createTime" />
+		 <result column="create_by_" jdbcType="BIGINT" property="createBy" />
+	</resultMap>
+
+	<sql id="Base_Column_List">
+		id_, music_sheet_id_, music_subject_, audio_file_url_, sort_number_, create_time_, create_by_
+	</sql>
+
+	<select id="get" parameterType="Long" resultMap="BaseResultMap">
+		 select
+		 <include refid="Base_Column_List" />
+		 from music_sheet_accompaniment
+		 where id_ = #{id}
 	</select>
+
+	<delete id="delete" parameterType="Long">
+		 delete from music_sheet_accompaniment
+		 where id_ = #{id}
+	</delete>
+	
+	<delete id="delete" parameterType="com.yonge.cooleshow.biz.dal.entity.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="com.yonge.cooleshow.biz.dal.entity.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="com.yonge.cooleshow.biz.dal.entity.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="findAll" resultMap="BaseResultMap">
+        SELECT * FROM music_sheet_accompaniment
+        ORDER BY id_ desc
+    </select>
+
+	<select id="findList" parameterType="com.yonge.cooleshow.biz.dal.entity.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>
+
 </mapper>

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

@@ -1,65 +1,287 @@
-<?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" >
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yonge.cooleshow.biz.dal.dao.MusicSheetDao">
+
 	<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
+	     <id column="id_" jdbcType="BIGINT" property="id" />
+		 <result column="music_sheet_name_" jdbcType="VARCHAR" property="musicSheetName" />
+		 <result column="user_id_" jdbcType="BIGINT" property="userId" />
+		 <result column="composer_" jdbcType="VARCHAR" property="composer" />
+		 <result column="music_subject_" jdbcType="VARCHAR" property="musicSubject" />
+		 <result column="audio_type_" jdbcType="VARCHAR" property="audioType" />
+		 <result column="music_tag_" jdbcType="VARCHAR" property="musicTag" />
+		 <result column="play_speed_" jdbcType="INTEGER" property="playSpeed" />
+		 <result column="can_evaluate_" jdbcType="TINYINT" property="canEvaluate" />
+		 <result column="show_fingering_" jdbcType="TINYINT" property="showFingering" />
+		 <result column="charge_type_" jdbcType="TINYINT" property="chargeType" />
+		 <result column="audit_status_" jdbcType="TINYINT" property="auditStatus" />
+		 <result column="sort_number_" jdbcType="INTEGER" property="sortNumber" />
+		 <result column="top_flag_" jdbcType="TINYINT" property="topFlag" />
+		 <result column="hot_flag_" jdbcType="TINYINT" property="hotFlag" />
+		 <result column="music_price_" jdbcType="DECIMAL" property="musicPrice" />
+		 <result column="audio_file_url_" jdbcType="VARCHAR" property="audioFileUrl" />
+		 <result column="xml_file_url_" jdbcType="VARCHAR" property="xmlFileUrl" />
+		 <result column="has_beat_" jdbcType="TINYINT" property="hasBeat" />
+		 <result column="create_time_" jdbcType="TIMESTAMP" property="createTime" />
+		 <result column="create_by_" jdbcType="BIGINT" property="createBy" />
+		 <result column="update_time_" jdbcType="TIMESTAMP" property="updateTime" />
+		 <result column="update_by_" jdbcType="BIGINT" property="updateBy" />
+		 <result column="remark_" jdbcType="VARCHAR" property="remark" />
+	</resultMap>
+
+	<sql id="Base_Column_List">
+		id_, 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_
+	</sql>
+
+	<select id="get" parameterType="Long" resultMap="BaseResultMap">
+		 select
+		 <include refid="Base_Column_List" />
+		 from music_sheet
+		 where id_ = #{id}
 	</select>
+
+	<delete id="delete" parameterType="Long">
+		 delete from music_sheet
+		 where id_ = #{id}
+	</delete>
+	
+	<delete id="delete" parameterType="com.yonge.cooleshow.biz.dal.entity.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="com.yonge.cooleshow.biz.dal.entity.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="com.yonge.cooleshow.biz.dal.entity.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="findAll" resultMap="BaseResultMap">
+        SELECT * FROM music_sheet
+        ORDER BY id_ desc
+    </select>
+
+	<select id="findList" parameterType="com.yonge.cooleshow.biz.dal.entity.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>
+
 </mapper>

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

@@ -1,33 +1,127 @@
-<?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" >
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yonge.cooleshow.biz.dal.dao.MusicSheetPurchaseRecordDao">
+
 	<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
+	     <id column="id_" jdbcType="BIGINT" property="id" />
+		 <result column="music_sheet_id_" jdbcType="BIGINT" property="musicSheetId" />
+		 <result column="teacher_id_" jdbcType="BIGINT" property="teacherId" />
+		 <result column="order_no_" jdbcType="VARCHAR" property="orderNo" />
+		 <result column="student_id_" jdbcType="BIGINT" property="studentId" />
+		 <result column="purchase_time_" jdbcType="TIMESTAMP" property="purchaseTime" />
+		 <result column="purchase_price_" jdbcType="DECIMAL" property="purchasePrice" />
+		 <result column="order_status_" jdbcType="TINYINT" property="orderStatus" />
+	</resultMap>
+
+	<sql id="Base_Column_List">
+		id_, music_sheet_id_, teacher_id_, order_no_, student_id_, purchase_time_, purchase_price_, order_status_
+	</sql>
+
+	<select id="get" parameterType="Long" resultMap="BaseResultMap">
+		 select
+		 <include refid="Base_Column_List" />
+		 from music_sheet_purchase_record
+		 where id_ = #{id}
 	</select>
+
+	<delete id="delete" parameterType="Long">
+		 delete from music_sheet_purchase_record
+		 where id_ = #{id}
+	</delete>
+	
+	<delete id="delete" parameterType="com.yonge.cooleshow.biz.dal.entity.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="com.yonge.cooleshow.biz.dal.entity.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="com.yonge.cooleshow.biz.dal.entity.MusicSheetPurchaseRecord">
+		 update music_sheet_purchase_record
+ 		 <set>
+		 	   		<if test="musicSheetId != null">
+		 	   			 music_sheet_id_ = #{musicSheetId},
+					</if>
+		 	   		<if test="teacherId != null">
+		 	   			 teacher_id_ = #{teacherId},
+					</if>
+				 	<if test="orderNo != null and orderNo != ''">
+						 order_no_ = #{orderNo},
+					</if>
+		 	   		<if test="studentId != null">
+		 	   			 student_id_ = #{studentId},
+					</if>
+		 	   		<if test="purchaseTime != null">
+		 	   			 purchase_time_ = #{purchaseTime},
+					</if>
+		 	   		<if test="purchasePrice != null">
+		 	   			 purchase_price_ = #{purchasePrice},
+					</if>
+		 	   		<if test="orderStatus != null">
+		 	   			 order_status_ = #{orderStatus},
+					</if>
+ 		 </set>
+		 where id_ = #{id}
+	</update>
+
+	<select id="findAll" resultMap="BaseResultMap">
+        SELECT * FROM music_sheet_purchase_record
+        ORDER BY id_ desc
+    </select>
+
+	<select id="findList" parameterType="com.yonge.cooleshow.biz.dal.entity.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>
+
 </mapper>

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

@@ -61,7 +61,8 @@
             <include refid="baseColumns"/>,
             u.real_name_ as realName,
             u.id_card_no_ as idCardNo,
-            u.phone_ as phone
+            u.phone_ as phone,
+            u.gender as gender
         FROM teacher_auth_entry_record t
         left join sys_user u on t.user_id_ = u.id_
         left join sys_user v on t.verify_user_id_ = u.id_
@@ -82,8 +83,8 @@
             <if test="param.endTime !=null">
                 <![CDATA[AND t.create_time_ <= #{param.endTime} ]]>
             </if>
-            <if test="param.teacherAuthStatus !=null">
-                AND t.teacher_auth_status_ = #{param.teacherAuthStatus}
+            <if test="param.authStatus !=null">
+                AND t.teacher_auth_status_ = #{param.authStatus}
             </if>
         </where>
     </select>

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

@@ -9,23 +9,62 @@
 	        <result column="reason_" property="reason" />
 	        <result column="create_time_" property="createTime" />
 	        <result column="update_time_" property="updateTime" />
-		</resultMap>  
-    
-    <!-- 表字段 -->
-    <sql id="baseColumns">
-         t.id_
-        , t.user_id_
-        , t.teacher_auth_status_
-        , t.verify_user_id_
-        , t.reason_
-        , t.create_time_
-        , t.update_time_
-        </sql> 
-    
-    <!-- 分页查询 -->
-    <select id="selectPage" resultMap="BaseResultMap">
-		SELECT         
-        	<include refid="baseColumns" />
+		</resultMap>
+
+	<!-- 表字段 -->
+	<sql id="baseColumns">
+         t.id_ as "id"
+        , t.user_id_ as "userId"
+        , t.teacher_auth_status_ as "teacherAuthStatus"
+        , t.verify_user_id_ as "verifyUserId"
+        , t.reason_ as "reason"
+        , t.create_time_ as "createTime"
+        , t.update_time_ as "updateTime"
+        </sql>
+
+	<!-- 分页查询 -->
+	<select id="selectPage" resultType = "com.yonge.cooleshow.biz.dal.vo.MusicianAuthEntryRecordVo">
+		SELECT
+		<include refid="baseColumns"/>,
+		u.real_name_ as realName,
+		u.id_card_no_ as idCardNo,
+		u.phone_ as phone
 		FROM teacher_auth_musician_record t
+		left join sys_user u on t.user_id_ = u.id_
+		left join sys_user v on t.verify_user_id_ = u.id_
+		<where>
+			<if test="null != param.search and '' != param.search">
+				AND (
+				t.user_id_ LIKE CONCAT('%', #{param.search}, '%') or
+				u.username_ LIKE CONCAT('%', #{param.search}, '%') or
+				u.phone_ LIKE CONCAT('%', #{param.search}, '%')
+				)
+			</if>
+			<if test="null != param.verifyUser and '' != param.verifyUser">
+				AND v.username_ LIKE CONCAT('%', #{param.verifyUser}, '%')
+			</if>
+			<if test="param.startTime !=null">
+				<![CDATA[AND t.create_time_ >= #{param.startTime} ]]>
+			</if>
+			<if test="param.endTime !=null">
+				<![CDATA[AND t.create_time_ <= #{param.endTime} ]]>
+			</if>
+			<if test="param.authStatus !=null">
+				AND t.teacher_auth_status_ = #{param.authStatus}
+			</if>
+		</where>
+	</select>
+
+	<select id="detail" resultType="com.yonge.cooleshow.biz.dal.vo.MusicianAuthEntryRecordVo">
+		select
+			<include refid="baseColumns"/>,
+			u.real_name_ as realName,
+			u.id_card_no_ as idCardNo,
+			(
+				SELECT u.username_ FROM sys_user u WHERE u.id_ = t.verify_user_id_
+			) as verifyUser
+		from teacher_auth_entry_record t
+		left join sys_user u on t.user_id_ = u.id_
+		where t.id_ = #{id}
 	</select>
 </mapper>

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

@@ -1,27 +1,97 @@
-<?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" >
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yonge.cooleshow.biz.dal.dao.VideoLessonEvaluateDao">
+
 	<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
+	     <id column="id_" jdbcType="BIGINT" property="id" />
+		 <result column="video_id_" jdbcType="BIGINT" property="videoId" />
+		 <result column="student_id_" jdbcType="BIGINT" property="studentId" />
+		 <result column="content_" jdbcType="VARCHAR" property="content" />
+		 <result column="evaluate_time_" jdbcType="TIMESTAMP" property="evaluateTime" />
+	</resultMap>
+
+	<sql id="Base_Column_List">
+		id_, video_id_, student_id_, content_, evaluate_time_
+	</sql>
+
+	<select id="get" parameterType="Long" resultMap="BaseResultMap">
+		 select
+		 <include refid="Base_Column_List" />
+		 from video_lesson_evaluate
+		 where id_ = #{id}
 	</select>
+
+	<delete id="delete" parameterType="Long">
+		 delete from video_lesson_evaluate
+		 where id_ = #{id}
+	</delete>
+	
+	<delete id="delete" parameterType="com.yonge.cooleshow.biz.dal.entity.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="com.yonge.cooleshow.biz.dal.entity.VideoLessonEvaluate">
+		 insert into video_lesson_evaluate
+ 		 (video_id_,student_id_,content_,evaluate_time_)
+		 values 
+ 		 (#{videoId},#{studentId},#{content},#{evaluateTime})
+	</insert>
+	
+	<update id="update" parameterType="com.yonge.cooleshow.biz.dal.entity.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="findAll" resultMap="BaseResultMap">
+        SELECT * FROM video_lesson_evaluate
+        ORDER BY id_ desc
+    </select>
+
+	<select id="findList" parameterType="com.yonge.cooleshow.biz.dal.entity.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>
+
 </mapper>

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

@@ -1,41 +1,167 @@
-<?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" >
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yonge.cooleshow.biz.dal.dao.VideoLessonGroupDetailDao">
+
 	<resultMap 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
+	     <id column="id_" jdbcType="BIGINT" property="id" />
+		 <result column="video_lesson_group_id_" jdbcType="BIGINT" property="videoLessonGroupId" />
+		 <result column="video_title_" jdbcType="VARCHAR" property="videoTitle" />
+		 <result column="video_content_" jdbcType="VARCHAR" property="videoContent" />
+		 <result column="video_url_" jdbcType="VARCHAR" property="videoUrl" />
+		 <result column="cover_url_" jdbcType="VARCHAR" property="coverUrl" />
+		 <result column="charge_flag_" jdbcType="TINYINT" property="chargeFlag" />
+		 <result column="sort_number_" jdbcType="INTEGER" property="sortNumber" />
+		 <result column="teacher_id_" jdbcType="BIGINT" property="teacherId" />
+		 <result column="create_time_" jdbcType="TIMESTAMP" property="createTime" />
+		 <result column="update_by_" jdbcType="BIGINT" property="updateBy" />
+		 <result column="update_time_" jdbcType="TIMESTAMP" property="updateTime" />
+	</resultMap>
+
+	<sql id="Base_Column_List">
+		id_, video_lesson_group_id_, video_title_, video_content_, video_url_, cover_url_, charge_flag_, sort_number_, teacher_id_, create_time_, update_by_, update_time_
+	</sql>
+
+	<select id="get" parameterType="Long" resultMap="BaseResultMap">
+		 select
+		 <include refid="Base_Column_List" />
+		 from video_lesson_group_detail
+		 where id_ = #{id}
 	</select>
+
+	<delete id="delete" parameterType="Long">
+		 delete from video_lesson_group_detail
+		 where id_ = #{id}
+	</delete>
+	
+	<delete id="delete" parameterType="com.yonge.cooleshow.biz.dal.entity.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="com.yonge.cooleshow.biz.dal.entity.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="com.yonge.cooleshow.biz.dal.entity.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="findAll" resultMap="BaseResultMap">
+        SELECT * FROM video_lesson_group_detail
+        ORDER BY id_ desc
+    </select>
+
+	<select id="findList" parameterType="com.yonge.cooleshow.biz.dal.entity.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>
+
 </mapper>

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

@@ -1,47 +1,197 @@
-<?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" >
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yonge.cooleshow.biz.dal.dao.VideoLessonGroupDao">
+
 	<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
+	     <id column="id_" jdbcType="BIGINT" property="id" />
+		 <result column="lesson_name_" jdbcType="VARCHAR" property="lessonName" />
+		 <result column="lesson_subject_" jdbcType="VARCHAR" property="lessonSubject" />
+		 <result column="lesson_desc_" jdbcType="VARCHAR" property="lessonDesc" />
+		 <result column="lesson_price_" jdbcType="INTEGER" property="lessonPrice" />
+		 <result column="lesson_cover_url_" jdbcType="VARCHAR" property="lessonCoverUrl" />
+		 <result column="teacher_id_" jdbcType="BIGINT" property="teacherId" />
+		 <result column="lesson_count_" jdbcType="INTEGER" property="lessonCount" />
+		 <result column="sort_number_" jdbcType="INTEGER" property="sortNumber" />
+		 <result column="lesson_tag_" jdbcType="VARCHAR" property="lessonTag" />
+		 <result column="top_flag_" jdbcType="TINYINT" property="topFlag" />
+		 <result column="hot_flag_" jdbcType="TINYINT" property="hotFlag" />
+		 <result column="audit_status_" jdbcType="TINYINT" property="auditStatus" />
+		 <result column="create_time_" jdbcType="TIMESTAMP" property="createTime" />
+		 <result column="update_time_" jdbcType="TIMESTAMP" property="updateTime" />
+	</resultMap>
+
+	<sql id="Base_Column_List">
+		id_, 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_
+	</sql>
+
+	<select id="get" parameterType="Long" resultMap="BaseResultMap">
+		 select
+		 <include refid="Base_Column_List" />
+		 from video_lesson_group
+		 where id_ = #{id}
 	</select>
+
+	<delete id="delete" parameterType="Long">
+		 delete from video_lesson_group
+		 where id_ = #{id}
+	</delete>
+	
+	<delete id="delete" parameterType="com.yonge.cooleshow.biz.dal.entity.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="com.yonge.cooleshow.biz.dal.entity.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="com.yonge.cooleshow.biz.dal.entity.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="findAll" resultMap="BaseResultMap">
+        SELECT * FROM video_lesson_group
+        ORDER BY id_ desc
+    </select>
+
+	<select id="findList" parameterType="com.yonge.cooleshow.biz.dal.entity.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>
+
 </mapper>

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

@@ -1,31 +1,117 @@
-<?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" >
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yonge.cooleshow.biz.dal.dao.VideoLessonPurchaseRecordDao">
+
 	<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
+	     <id column="id_" jdbcType="BIGINT" property="id" />
+		 <result column="video_lesson_group_id_" jdbcType="BIGINT" property="videoLessonGroupId" />
+		 <result column="student_id_" jdbcType="BIGINT" property="studentId" />
+		 <result column="purchase_time_" jdbcType="TIMESTAMP" property="purchaseTime" />
+		 <result column="pay_money_" jdbcType="DECIMAL" property="payMoney" />
+		 <result column="order_no_" jdbcType="VARCHAR" property="orderNo" />
+		 <result column="order_status_" jdbcType="TINYINT" property="orderStatus" />
+	</resultMap>
+
+	<sql id="Base_Column_List">
+		id_, video_lesson_group_id_, student_id_, purchase_time_, pay_money_, order_no_, order_status_
+	</sql>
+
+	<select id="get" parameterType="Long" resultMap="BaseResultMap">
+		 select
+		 <include refid="Base_Column_List" />
+		 from video_lesson_purchase_record
+		 where id_ = #{id}
 	</select>
+
+	<delete id="delete" parameterType="Long">
+		 delete from video_lesson_purchase_record
+		 where id_ = #{id}
+	</delete>
+	
+	<delete id="delete" parameterType="com.yonge.cooleshow.biz.dal.entity.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="com.yonge.cooleshow.biz.dal.entity.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="com.yonge.cooleshow.biz.dal.entity.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="findAll" resultMap="BaseResultMap">
+        SELECT * FROM video_lesson_purchase_record
+        ORDER BY id_ desc
+    </select>
+
+	<select id="findList" parameterType="com.yonge.cooleshow.biz.dal.entity.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>
+
 </mapper>