Merge remote-tracking branch 'origin/master'

.gitignore

@@ -22,10 +22,8 @@ mvnw.cmd
 *.iml
 *.ipr
 /toolset/codegen/src/main/resources/generateConfigration.xml
-/cooleshow-user/user-admin/src/main/resources/bootstrap-dev.yml
-/cooleshow-user/user-student/src/main/resources/bootstrap-dev.yml
-/cooleshow-user/user-teacher/src/main/resources/bootstrap-dev.yml
-/cooleshow-auth/auth-server/src/main/resources/bootstrap-dev.yml
+**/bootstrap-dev.yml
+
 
 ### 忽略子模块的文件 ###
 **/*.ims

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

@@ -26,6 +26,9 @@ public class SysRole {
 	@ApiModelProperty(value = "角色描述",required = false)
 	private String roleDesc;
 	
+	@ApiModelProperty(value = "是否启用",required = false)
+	private Boolean isEnable;
+	
 	/**  */
 	private java.util.Date createTime;
 	
@@ -79,6 +82,14 @@ public class SysRole {
 		return this.roleDesc;
 	}
 			
+	public Boolean getIsEnable() {
+		return isEnable;
+	}
+
+	public void setIsEnable(Boolean isEnable) {
+		this.isEnable = isEnable;
+	}
+
 	public void setCreateTime(java.util.Date createTime){
 		this.createTime = createTime;
 	}

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

@@ -8,6 +8,8 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
  * 对应数据库表(sys_role_menu):
  */
 public class SysRoleMenu {
+	
+	private Long id;
 
 	/** 角色ID */
 	@ApiModelProperty(value = "角色ID",required = false)
@@ -25,6 +27,14 @@ public class SysRoleMenu {
 	public SysRoleMenu() {
 	}
 
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
 	public void setRoleId(Long roleId){
 		this.roleId = roleId;
 	}

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

@@ -11,6 +11,7 @@
         <result column="role_name_" property="roleName"/>
         <result column="role_code_" property="roleCode"/>
         <result column="role_desc_" property="roleDesc"/>
+        <result column="is_enable_" property="isEnable"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
         <result column="del_flag_" property="delFlag"/>
@@ -29,8 +30,8 @@
     <!-- 向数据库增加一条记录 -->
     <insert id="insert" parameterType="com.yonge.cooleshow.auth.api.entity.SysRole" useGeneratedKeys="true" keyColumn="id"
             keyProperty="id">
-        INSERT INTO sys_role (id_,role_name_,role_code_,role_desc_,create_time_,update_time_)
-        VALUES(#{id},#{roleName},#{roleCode},#{roleDesc},now(),now())
+        INSERT INTO sys_role (id_,role_name_,role_code_,role_desc_,create_time_,update_time_,is_enable_)
+        VALUES(#{id},#{roleName},#{roleCode},#{roleDesc},now(),now(),#{isEnable})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -52,6 +53,9 @@
             <if test="updateTime != null">
                 update_time_ = NOW(),
             </if>
+            <if test="isEnable != null">
+                is_enable_ = #{isEnable},
+            </if>
         </set>
         WHERE id_ = #{id}
     </update>

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

@@ -7,6 +7,7 @@
 <mapper namespace="com.yonge.cooleshow.auth.dal.dao.SysRoleMenuDao">
 	
 	<resultMap type="com.yonge.cooleshow.auth.api.entity.SysRoleMenu" id="SysRoleMenu">
+		<result column="id_" property="id" />
 		<result column="role_id_" property="roleId" />
 		<result column="menu_id_" property="menuId" />
 	</resultMap>

cooleshow-common/src/main/java/com/yonge/cooleshow/common/constant/CommonConstants.java

@@ -40,4 +40,10 @@ public interface CommonConstants {
 	Integer DECIMAL_FINAL_PLACE = 2;
 
 	String DEFULT_PASSWORD = "123456";
+	/***
+	 * redis缓存分隔符
+	 * @author liweifan
+	 * @updateTime 2022/3/28 16:29
+	 */
+	String REDIS_SPLIT = ":";
 }

cooleshow-gateway/gateway-web/src/main/resources/bootstrap-dev.properties

@@ -1,17 +0,0 @@
-#\u6307\u5b9a\u5f00\u53d1\u73af\u5883
-#spring.profiles.active=dev
-#\u670d\u52a1\u5668\u5730\u5740
-spring.cloud.nacos.config.server-addr=47.114.1.200:8848
-
-#\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
-spring.cloud.nacos.config.namespace=6f8374a9-598f-4889-bb17-476070ffb8de
-#\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
-spring.cloud.nacos.config.group=DEFAULT_GROUP
-#\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}
-spring.cloud.nacos.config.prefix=gateway-web
-#\u6307\u5b9a\u6587\u4ef6\u540e\u7f00
-spring.cloud.nacos.config.file-extension=yaml
-#\u662f\u5426\u52a8\u6001\u5237\u65b0
-spring.cloud.nacos.config.refresh.enabled=true
-#\u662f\u5426\u542f\u7528nacos\u914d\u7f6e\u4e2d\u5fc3
-spring.cloud.nacos.config.enabled=true

cooleshow-task/src/main/java/com/yonge/cooleshow/task/feign/TeacherFeignService.java

@@ -0,0 +1,19 @@
+package com.yonge.cooleshow.task.feign;
+
+import com.yonge.cooleshow.common.config.FeignConfiguration;
+import com.yonge.cooleshow.task.feign.fallback.TeacherFeignServiceFallback;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+
+@FeignClient(name = "teacher-server", configuration = FeignConfiguration.class, fallback = TeacherFeignServiceFallback.class)
+public interface TeacherFeignService {
+
+    /***
+     * 统计老师首页数据
+     * @author liweifan
+     * @updateTime 2022/3/28 15:34
+     * @return: java.lang.Object
+     */
+    @GetMapping(value = "/task/queryTeacherHomeTotal")
+    Object queryTeacherHomeTotal();
+}

cooleshow-task/src/main/java/com/yonge/cooleshow/task/feign/fallback/TeacherFeignServiceFallback.java

@@ -0,0 +1,13 @@
+package com.yonge.cooleshow.task.feign.fallback;
+
+import com.yonge.cooleshow.task.feign.TeacherFeignService;
+import org.springframework.stereotype.Component;
+
+@Component
+public class TeacherFeignServiceFallback implements TeacherFeignService {
+
+    @Override
+    public Object queryTeacherHomeTotal() {
+        return null;
+    }
+}

cooleshow-task/src/main/java/com/yonge/cooleshow/task/jobs/QueryTeacherHomeTotalTask.java

@@ -0,0 +1,22 @@
+package com.yonge.cooleshow.task.jobs;
+
+import com.yonge.cooleshow.task.core.BaseTask;
+import com.yonge.cooleshow.task.core.TaskException;
+import com.yonge.cooleshow.task.feign.TeacherFeignService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022/3/28 15:55
+ */
+@Service
+public class QueryTeacherHomeTotalTask extends BaseTask {
+    @Autowired
+    private TeacherFeignService teacherFeignService;
+
+    @Override
+    public void execute() throws TaskException {
+        teacherFeignService.queryTeacherHomeTotal();
+    }
+}

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

@@ -1,26 +1,31 @@
 package com.yonge.cooleshow.admin.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import javax.validation.Valid;
-import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.dto.AlbumFavoriteDto;
 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 org.springframework.web.bind.annotation.RequestMapping;
 import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.biz.dal.entity.AlbumFavorite;
 import com.yonge.cooleshow.biz.dal.service.AlbumFavoriteService;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 
 /**
  * 专辑收藏表 web 控制层
  * @author yzp
- * @date 2022-03-22 16:40:36
+ * @date 2022-03-26 00:21:45
  * @version v1.0
  **/
 @RestController
-@RequestMapping("/admin/favor/album")
-@Api(tags = "专辑收藏表 web 控制层")
+@RequestMapping("/album/favorite")
+@Api(tags = "专辑收藏表 API接口")
 public class AlbumFavoriteController extends BaseController {
     @Autowired
     private SysUserFeignService sysUserFeignService;
@@ -28,9 +33,9 @@ public class AlbumFavoriteController extends BaseController {
 	@Autowired
 	private AlbumFavoriteService albumFavoriteService;
 
-	@ApiOperation(value = "新增")
-    @PostMapping("/create")
-    public Object create(@Valid @RequestBody AlbumFavorite albumFavorite) {
+	@ApiOperation(value = "新增", httpMethod="POST", consumes="application/json", produces="application/json")
+    @PostMapping(value="/create", consumes="application/json", produces="application/json")
+    public HttpResponseResult<Object> create(@Valid @RequestBody AlbumFavorite albumFavorite) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");
@@ -38,11 +43,11 @@ public class AlbumFavoriteController extends BaseController {
 
         //albumFavorite.setCreateBy(sysUser.getId());
         //albumFavorite.setCreateTime(new Date());
-        albumFavoriteService.insert(albumFavorite);
+        albumFavoriteService.save(albumFavorite);
         return succeed();
     }
 
-    @ApiOperation(value = "删除")
+    @ApiOperation(value = "删除", httpMethod="POST", consumes="application/json", produces="application/json")
     @PostMapping("/delete/{id}")
     public Object delete(@PathVariable Long id) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
@@ -50,13 +55,13 @@ public class AlbumFavoriteController extends BaseController {
             return failed("用户信息获取失败");
         }
 
-        albumFavoriteService.delete(id);
+        albumFavoriteService.removeById(id);
         return succeed();
     }
 
-    @ApiOperation(value = "修改")
-    @PostMapping("/update")
-    public Object update(@Valid @RequestBody AlbumFavorite albumFavorite) {
+    @ApiOperation(value = "修改", httpMethod="POST", consumes="application/json", produces="application/json")
+    @PostMapping(value="/update", consumes="application/json", produces="application/json")
+    public HttpResponseResult<Object> update(@Valid @RequestBody AlbumFavorite albumFavorite) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");
@@ -67,20 +72,20 @@ public class AlbumFavoriteController extends BaseController {
 
         //albumFavorite.setUpdateBy(sysUser.getId());
         //albumFavorite.setUpdateTime(new Date());
-        albumFavoriteService.update(albumFavorite);
+        albumFavoriteService.updateById(albumFavorite);
         return succeed();
     }
 
-    @ApiOperation(value = "分页查询")
-    @PostMapping("/list")
-    public Object list(@RequestBody AlbumFavorite albumFavorite) {
+    @ApiOperation(value = "分页查询", httpMethod="POST", consumes="application/json", produces="application/json")
+    @PostMapping(value="/list", consumes="application/json", produces="application/json")
+    public HttpResponseResult<Object> list(@RequestBody AlbumFavoriteDto albumFavoriteDto) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
 
-        int pageNo = albumFavorite.getPageNo();
-        int pageSize = albumFavorite.getPageSize();
+        int pageNo = albumFavoriteDto.getPageNo();
+        int pageSize = albumFavoriteDto.getPageSize();
 
         try {
             if (pageNo==0) {
@@ -90,11 +95,14 @@ public class AlbumFavoriteController extends BaseController {
                 pageSize = 10;
             }
 
-            PageHelper.startPage(pageNo,pageSize);
-            return succeed(albumFavoriteService.findList(albumFavorite));
+            LambdaQueryWrapper<AlbumFavorite> lambdaQueryWrapper = Wrappers.lambdaQuery();
+            //lambdaQueryWrapper.like(AlbumFavorite::getName , "k");
+
+            Page<AlbumFavorite> page = new Page<>(pageNo,pageSize);
+            return succeed(albumFavoriteService.page(page, lambdaQueryWrapper));
         } catch (Exception e) {
             e.printStackTrace();
-            return null;
+            return HttpResponseResult.failed(e.getMessage());
         }
     }
 }

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

@@ -1,26 +1,31 @@
 package com.yonge.cooleshow.admin.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import javax.validation.Valid;
-import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.dto.AlbumMusicRelateDto;
 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 org.springframework.web.bind.annotation.RequestMapping;
 import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.biz.dal.entity.AlbumMusicRelate;
 import com.yonge.cooleshow.biz.dal.service.AlbumMusicRelateService;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 
 /**
  * 专辑曲谱关联表 web 控制层
  * @author yzp
- * @date 2022-03-22 16:40:36
+ * @date 2022-03-26 00:21:46
  * @version v1.0
  **/
 @RestController
-@RequestMapping("/admin/album/relate")
-@Api(tags = "专辑曲谱关联表 web 控制层")
+@RequestMapping("/album/music/relate")
+@Api(tags = "专辑曲谱关联表 API接口")
 public class AlbumMusicRelateController extends BaseController {
     @Autowired
     private SysUserFeignService sysUserFeignService;
@@ -28,9 +33,9 @@ public class AlbumMusicRelateController extends BaseController {
 	@Autowired
 	private AlbumMusicRelateService albumMusicRelateService;
 
-	@ApiOperation(value = "新增")
-    @PostMapping("/create")
-    public Object create(@Valid @RequestBody AlbumMusicRelate albumMusicRelate) {
+	@ApiOperation(value = "新增", httpMethod="POST", consumes="application/json", produces="application/json")
+    @PostMapping(value="/create", consumes="application/json", produces="application/json")
+    public HttpResponseResult<Object> create(@Valid @RequestBody AlbumMusicRelate albumMusicRelate) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");
@@ -38,11 +43,11 @@ public class AlbumMusicRelateController extends BaseController {
 
         //albumMusicRelate.setCreateBy(sysUser.getId());
         //albumMusicRelate.setCreateTime(new Date());
-        albumMusicRelateService.insert(albumMusicRelate);
+        albumMusicRelateService.save(albumMusicRelate);
         return succeed();
     }
 
-    @ApiOperation(value = "删除")
+    @ApiOperation(value = "删除", httpMethod="POST", consumes="application/json", produces="application/json")
     @PostMapping("/delete/{id}")
     public Object delete(@PathVariable Long id) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
@@ -50,13 +55,13 @@ public class AlbumMusicRelateController extends BaseController {
             return failed("用户信息获取失败");
         }
 
-        albumMusicRelateService.delete(id);
+        albumMusicRelateService.removeById(id);
         return succeed();
     }
 
-    @ApiOperation(value = "修改")
-    @PostMapping("/update")
-    public Object update(@Valid @RequestBody AlbumMusicRelate albumMusicRelate) {
+    @ApiOperation(value = "修改", httpMethod="POST", consumes="application/json", produces="application/json")
+    @PostMapping(value="/update", consumes="application/json", produces="application/json")
+    public HttpResponseResult<Object> update(@Valid @RequestBody AlbumMusicRelate albumMusicRelate) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");
@@ -67,20 +72,20 @@ public class AlbumMusicRelateController extends BaseController {
 
         //albumMusicRelate.setUpdateBy(sysUser.getId());
         //albumMusicRelate.setUpdateTime(new Date());
-        albumMusicRelateService.update(albumMusicRelate);
+        albumMusicRelateService.updateById(albumMusicRelate);
         return succeed();
     }
 
-    @ApiOperation(value = "分页查询")
-    @PostMapping("/list")
-    public Object list(@RequestBody AlbumMusicRelate albumMusicRelate) {
+    @ApiOperation(value = "分页查询", httpMethod="POST", consumes="application/json", produces="application/json")
+    @PostMapping(value="/list", consumes="application/json", produces="application/json")
+    public HttpResponseResult<Object> list(@RequestBody AlbumMusicRelateDto albumMusicRelateDto) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
 
-        int pageNo = albumMusicRelate.getPageNo();
-        int pageSize = albumMusicRelate.getPageSize();
+        int pageNo = albumMusicRelateDto.getPageNo();
+        int pageSize = albumMusicRelateDto.getPageSize();
 
         try {
             if (pageNo==0) {
@@ -90,11 +95,14 @@ public class AlbumMusicRelateController extends BaseController {
                 pageSize = 10;
             }
 
-            PageHelper.startPage(pageNo,pageSize);
-            return succeed(albumMusicRelateService.findList(albumMusicRelate));
+            LambdaQueryWrapper<AlbumMusicRelate> lambdaQueryWrapper = Wrappers.lambdaQuery();
+            //lambdaQueryWrapper.like(AlbumMusicRelate::getName , "k");
+
+            Page<AlbumMusicRelate> page = new Page<>(pageNo,pageSize);
+            return succeed(albumMusicRelateService.page(page, lambdaQueryWrapper));
         } catch (Exception e) {
             e.printStackTrace();
-            return null;
+            return HttpResponseResult.failed(e.getMessage());
         }
     }
 }

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

@@ -0,0 +1,100 @@
+package com.yonge.cooleshow.admin.controller;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import com.yonge.cooleshow.biz.dal.support.Condition;
+import com.yonge.cooleshow.biz.dal.support.Query;
+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 com.yonge.cooleshow.biz.dal.entity.CourseHomework;
+import com.yonge.cooleshow.biz.dal.service.CourseHomeworkService;
+
+@RestController
+@RequestMapping("/courseHomework")
+@Api(value = "课程作业表", tags = "课程作业表")
+public class CourseHomeworkController extends BaseController {
+
+    @Autowired
+    private CourseHomeworkService courseHomeworkService;
+
+	/**
+     * 查询单条
+     */
+    @GetMapping("/detail")
+    @ApiOperation(value = "详情", notes = "传入courseHomework")
+    public HttpResponseResult<CourseHomework> detail(CourseHomework courseHomework) {
+		CourseHomework detail = courseHomeworkService.getOne(Condition.getQueryWrapper(courseHomework));
+		return succeed(detail);
+	}
+    
+    
+    /**
+     * 查询集合
+     */
+    @GetMapping("/list")
+    @ApiOperation(value = "查询集合", notes = "传入courseHomework")
+    public HttpResponseResult<List<CourseHomework>> list(CourseHomework courseHomework) {
+		List<CourseHomework> list = courseHomeworkService.list();
+		return succeed(list);
+	}
+    
+    /**
+     * 查询分页
+     */
+    @GetMapping("/page")
+    @ApiOperation(value = "查询分页", notes = "传入courseHomework")
+    public HttpResponseResult<PageInfo<CourseHomework>> page(CourseHomework courseHomework, Query query) {
+		IPage<CourseHomework> pages = courseHomeworkService.selectPage(Condition.getPage(query), courseHomework);
+        return succeed(Condition.pageInfo(pages));
+	}
+    
+    /**
+	 * 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperation(value = "新增", notes = "传入courseHomework")
+	public HttpResponseResult save(@Valid @RequestBody CourseHomework courseHomework) {
+    	return status(courseHomeworkService.save(courseHomework));
+	}
+    
+    /**
+	 * 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperation(value = "修改", notes = "传入courseHomework")
+	public HttpResponseResult update(@Valid @RequestBody CourseHomework courseHomework) {
+        return status(courseHomeworkService.updateById(courseHomework));
+	}
+    
+    /**
+	 * 新增或修改
+	 */
+    @PostMapping("/submit")
+    @ApiOperation(value = "新增或修改", notes = "传入courseHomework")
+	public HttpResponseResult submit(@RequestBody CourseHomework courseHomework) {
+        return status(courseHomeworkService.saveOrUpdate(courseHomework));
+    }
+
+ 	/**
+	 * 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public HttpResponseResult remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+        if (StringUtil.isEmpty(ids)) {
+			return failed("参数不能为空");
+		}
+		return status(courseHomeworkService.removeByIds(StringUtil.toLongList(ids)));
+	}
+}

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

@@ -0,0 +1,100 @@
+package com.yonge.cooleshow.admin.controller;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import com.yonge.cooleshow.biz.dal.support.Condition;
+import com.yonge.cooleshow.biz.dal.support.Query;
+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 com.yonge.cooleshow.biz.dal.entity.CourseScheduleReplied;
+import com.yonge.cooleshow.biz.dal.service.CourseScheduleRepliedService;
+
+@RestController
+@RequestMapping("/courseScheduleReplied")
+@Api(value = "课程点评", tags = "课程点评")
+public class CourseScheduleRepliedController extends BaseController {
+
+    @Autowired
+    private CourseScheduleRepliedService courseScheduleRepliedService;
+
+	/**
+     * 查询单条
+     */
+    @GetMapping("/detail")
+    @ApiOperation(value = "详情", notes = "传入courseScheduleReplied")
+    public HttpResponseResult<CourseScheduleReplied> detail(CourseScheduleReplied courseScheduleReplied) {
+		CourseScheduleReplied detail = courseScheduleRepliedService.getOne(Condition.getQueryWrapper(courseScheduleReplied));
+		return succeed(detail);
+	}
+    
+    
+    /**
+     * 查询集合
+     */
+    @GetMapping("/list")
+    @ApiOperation(value = "查询集合", notes = "传入courseScheduleReplied")
+    public HttpResponseResult<List<CourseScheduleReplied>> list(CourseScheduleReplied courseScheduleReplied) {
+		List<CourseScheduleReplied> list = courseScheduleRepliedService.list();
+		return succeed(list);
+	}
+    
+    /**
+     * 查询分页
+     */
+    @GetMapping("/page")
+    @ApiOperation(value = "查询分页", notes = "传入courseScheduleReplied")
+    public HttpResponseResult<PageInfo<CourseScheduleReplied>> page(CourseScheduleReplied courseScheduleReplied, Query query) {
+		IPage<CourseScheduleReplied> pages = courseScheduleRepliedService.selectPage(Condition.getPage(query), courseScheduleReplied);
+        return succeed(Condition.pageInfo(pages));
+	}
+    
+    /**
+	 * 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperation(value = "新增", notes = "传入courseScheduleReplied")
+	public HttpResponseResult save(@Valid @RequestBody CourseScheduleReplied courseScheduleReplied) {
+    	return status(courseScheduleRepliedService.save(courseScheduleReplied));
+	}
+    
+    /**
+	 * 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperation(value = "修改", notes = "传入courseScheduleReplied")
+	public HttpResponseResult update(@Valid @RequestBody CourseScheduleReplied courseScheduleReplied) {
+        return status(courseScheduleRepliedService.updateById(courseScheduleReplied));
+	}
+    
+    /**
+	 * 新增或修改
+	 */
+    @PostMapping("/submit")
+    @ApiOperation(value = "新增或修改", notes = "传入courseScheduleReplied")
+	public HttpResponseResult submit(@RequestBody CourseScheduleReplied courseScheduleReplied) {
+        return status(courseScheduleRepliedService.saveOrUpdate(courseScheduleReplied));
+    }
+
+ 	/**
+	 * 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public HttpResponseResult remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+        if (StringUtil.isEmpty(ids)) {
+			return failed("参数不能为空");
+		}
+		return status(courseScheduleRepliedService.removeByIds(StringUtil.toLongList(ids)));
+	}
+}

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

@@ -1,5 +1,8 @@
 package com.yonge.cooleshow.admin.controller;
 
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.dao.EmployeeDao;
 import com.yonge.cooleshow.biz.dal.dto.search.EmployeeSearch;
 import com.yonge.cooleshow.biz.dal.support.Query;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
@@ -27,16 +30,19 @@ import com.yonge.cooleshow.common.controller.BaseController;
 @Api(tags = "员工管理")
 @RestController
 public class EmployeeController extends BaseController {
-
     @Autowired
     private EmployeeService employeeService;
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
+    @Autowired
+    private EmployeeDao employeeDao;
 
     @GetMapping("/detail/{userId}")
     @ApiOperation(value = "详情", notes = "传入student")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "userId", value = "userId", paramType = "path", dataType = "long", required = true),
     })
-    public HttpResponseResult<Employee> detail(Long userId) throws Exception{
+    public HttpResponseResult<Employee> detail(Long userId){
         Employee detail = employeeService.detail(userId);
         return succeed(detail);
     }
@@ -73,7 +79,7 @@ public class EmployeeController extends BaseController {
         return succeed(employeeService.findAll(null));
     }*/
 
-    /*@ApiOperation(value = "获取用户信息")
+    @ApiOperation(value = "获取用户信息")
     @GetMapping("/queryUserInfo")
     public Object apiQueryUserInfo() {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
@@ -85,6 +91,6 @@ public class EmployeeController extends BaseController {
             return succeed(employee);
         }
         return failed("获取用户信息失败");
-    }*/
+    }
 
 }

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

@@ -3,7 +3,10 @@ package com.yonge.cooleshow.admin.controller;
 import io.swagger.annotations.Api;
 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;
@@ -12,6 +15,8 @@ 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.MemberPriceSettings;
 import com.yonge.cooleshow.biz.dal.service.MemberPriceSettingsService;
 import com.yonge.cooleshow.common.controller.BaseController;
@@ -27,6 +32,9 @@ public class MemberPriceSettingsController extends BaseController {
 	@Autowired
 	private MemberPriceSettingsService memberPriceSettingsService;
 
+	@Autowired
+	private SysUserFeignService sysUserFeignService;
+
 	@ApiOperation("分页查询")
 	@GetMapping(value = "/list")
 	@PreAuthorize("@pcs.hasPermissions('memberPriceSettings/list')")
@@ -38,6 +46,12 @@ public class MemberPriceSettingsController extends BaseController {
 	@PostMapping(value = "/update", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
 	@PreAuthorize("@pcs.hasPermissions('memberPriceSettings/update')")
 	public HttpResponseResult<Object> update(@RequestBody MemberPriceSettings memberPriceSettings) {
+		SysUser user = sysUserFeignService.queryUserInfo();
+
+		if (user == null || user.getId() == null) {
+			return failed(HttpStatus.FORBIDDEN, "请登录");
+		}
+		memberPriceSettings.setUpdateBy(user.getId()).setUpdateTime(new Date());
 		memberPriceSettingsService.update(memberPriceSettings);
 		return succeed();
 	}

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

@@ -1,26 +1,31 @@
 package com.yonge.cooleshow.admin.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import javax.validation.Valid;
-import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.dto.MusicAlbumDto;
 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 org.springframework.web.bind.annotation.RequestMapping;
 import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.biz.dal.entity.MusicAlbum;
 import com.yonge.cooleshow.biz.dal.service.MusicAlbumService;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 
 /**
  * 专辑表 web 控制层
  * @author yzp
- * @date 2022-03-22 16:40:36
+ * @date 2022-03-26 00:21:46
  * @version v1.0
  **/
 @RestController
-@RequestMapping("/admin/music/album")
-@Api(tags = "专辑表 web 控制层")
+@RequestMapping("/music/album")
+@Api(tags = "专辑表 API接口")
 public class MusicAlbumController extends BaseController {
     @Autowired
     private SysUserFeignService sysUserFeignService;
@@ -28,9 +33,9 @@ public class MusicAlbumController extends BaseController {
 	@Autowired
 	private MusicAlbumService musicAlbumService;
 
-	@ApiOperation(value = "新增")
-    @PostMapping("/create")
-    public Object create(@Valid @RequestBody MusicAlbum musicAlbum) {
+	@ApiOperation(value = "新增", httpMethod="POST", consumes="application/json", produces="application/json")
+    @PostMapping(value="/create", consumes="application/json", produces="application/json")
+    public HttpResponseResult<Object> create(@Valid @RequestBody MusicAlbum musicAlbum) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");
@@ -38,11 +43,11 @@ public class MusicAlbumController extends BaseController {
 
         //musicAlbum.setCreateBy(sysUser.getId());
         //musicAlbum.setCreateTime(new Date());
-        musicAlbumService.insert(musicAlbum);
+        musicAlbumService.save(musicAlbum);
         return succeed();
     }
 
-    @ApiOperation(value = "删除")
+    @ApiOperation(value = "删除", httpMethod="POST", consumes="application/json", produces="application/json")
     @PostMapping("/delete/{id}")
     public Object delete(@PathVariable Long id) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
@@ -50,13 +55,13 @@ public class MusicAlbumController extends BaseController {
             return failed("用户信息获取失败");
         }
 
-        musicAlbumService.delete(id);
+        musicAlbumService.removeById(id);
         return succeed();
     }
 
-    @ApiOperation(value = "修改")
-    @PostMapping("/update")
-    public Object update(@Valid @RequestBody MusicAlbum musicAlbum) {
+    @ApiOperation(value = "修改", httpMethod="POST", consumes="application/json", produces="application/json")
+    @PostMapping(value="/update", consumes="application/json", produces="application/json")
+    public HttpResponseResult<Object> update(@Valid @RequestBody MusicAlbum musicAlbum) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");
@@ -67,20 +72,20 @@ public class MusicAlbumController extends BaseController {
 
         //musicAlbum.setUpdateBy(sysUser.getId());
         //musicAlbum.setUpdateTime(new Date());
-        musicAlbumService.update(musicAlbum);
+        musicAlbumService.updateById(musicAlbum);
         return succeed();
     }
 
-    @ApiOperation(value = "分页查询")
-    @PostMapping("/list")
-    public Object list(@RequestBody MusicAlbum musicAlbum) {
+    @ApiOperation(value = "分页查询", httpMethod="POST", consumes="application/json", produces="application/json")
+    @PostMapping(value="/list", consumes="application/json", produces="application/json")
+    public HttpResponseResult<Object> list(@RequestBody MusicAlbumDto musicAlbumDto) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
 
-        int pageNo = musicAlbum.getPageNo();
-        int pageSize = musicAlbum.getPageSize();
+        int pageNo = musicAlbumDto.getPageNo();
+        int pageSize = musicAlbumDto.getPageSize();
 
         try {
             if (pageNo==0) {
@@ -90,11 +95,14 @@ public class MusicAlbumController extends BaseController {
                 pageSize = 10;
             }
 
-            PageHelper.startPage(pageNo,pageSize);
-            return succeed(musicAlbumService.findList(musicAlbum));
+            LambdaQueryWrapper<MusicAlbum> lambdaQueryWrapper = Wrappers.lambdaQuery();
+            //lambdaQueryWrapper.like(MusicAlbum::getName , "k");
+
+            Page<MusicAlbum> page = new Page<>(pageNo,pageSize);
+            return succeed(musicAlbumService.page(page, lambdaQueryWrapper));
         } catch (Exception e) {
             e.printStackTrace();
-            return null;
+            return HttpResponseResult.failed(e.getMessage());
         }
     }
 }

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

@@ -1,26 +1,31 @@
 package com.yonge.cooleshow.admin.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import javax.validation.Valid;
-import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.dto.MusicFavoriteDto;
 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 org.springframework.web.bind.annotation.RequestMapping;
 import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.biz.dal.entity.MusicFavorite;
 import com.yonge.cooleshow.biz.dal.service.MusicFavoriteService;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 
 /**
  * 乐谱收藏表 web 控制层
  * @author yzp
- * @date 2022-03-22 16:40:36
+ * @date 2022-03-26 00:21:46
  * @version v1.0
  **/
 @RestController
-@RequestMapping("/admin/favor/music")
-@Api(tags = "乐谱收藏表 web 控制层")
+@RequestMapping("/music/favorite")
+@Api(tags = "乐谱收藏表 API接口")
 public class MusicFavoriteController extends BaseController {
     @Autowired
     private SysUserFeignService sysUserFeignService;
@@ -28,9 +33,9 @@ public class MusicFavoriteController extends BaseController {
 	@Autowired
 	private MusicFavoriteService musicFavoriteService;
 
-	@ApiOperation(value = "新增")
-    @PostMapping("/create")
-    public Object create(@Valid @RequestBody MusicFavorite musicFavorite) {
+	@ApiOperation(value = "新增", httpMethod="POST", consumes="application/json", produces="application/json")
+    @PostMapping(value="/create", consumes="application/json", produces="application/json")
+    public HttpResponseResult<Object> create(@Valid @RequestBody MusicFavorite musicFavorite) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");
@@ -38,11 +43,11 @@ public class MusicFavoriteController extends BaseController {
 
         //musicFavorite.setCreateBy(sysUser.getId());
         //musicFavorite.setCreateTime(new Date());
-        musicFavoriteService.insert(musicFavorite);
+        musicFavoriteService.save(musicFavorite);
         return succeed();
     }
 
-    @ApiOperation(value = "删除")
+    @ApiOperation(value = "删除", httpMethod="POST", consumes="application/json", produces="application/json")
     @PostMapping("/delete/{id}")
     public Object delete(@PathVariable Long id) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
@@ -50,13 +55,13 @@ public class MusicFavoriteController extends BaseController {
             return failed("用户信息获取失败");
         }
 
-        musicFavoriteService.delete(id);
+        musicFavoriteService.removeById(id);
         return succeed();
     }
 
-    @ApiOperation(value = "修改")
-    @PostMapping("/update")
-    public Object update(@Valid @RequestBody MusicFavorite musicFavorite) {
+    @ApiOperation(value = "修改", httpMethod="POST", consumes="application/json", produces="application/json")
+    @PostMapping(value="/update", consumes="application/json", produces="application/json")
+    public HttpResponseResult<Object> update(@Valid @RequestBody MusicFavorite musicFavorite) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");
@@ -67,20 +72,20 @@ public class MusicFavoriteController extends BaseController {
 
         //musicFavorite.setUpdateBy(sysUser.getId());
         //musicFavorite.setUpdateTime(new Date());
-        musicFavoriteService.update(musicFavorite);
+        musicFavoriteService.updateById(musicFavorite);
         return succeed();
     }
 
-    @ApiOperation(value = "分页查询")
-    @PostMapping("/list")
-    public Object list(@RequestBody MusicFavorite musicFavorite) {
+    @ApiOperation(value = "分页查询", httpMethod="POST", consumes="application/json", produces="application/json")
+    @PostMapping(value="/list", consumes="application/json", produces="application/json")
+    public HttpResponseResult<Object> list(@RequestBody MusicFavoriteDto musicFavoriteDto) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
 
-        int pageNo = musicFavorite.getPageNo();
-        int pageSize = musicFavorite.getPageSize();
+        int pageNo = musicFavoriteDto.getPageNo();
+        int pageSize = musicFavoriteDto.getPageSize();
 
         try {
             if (pageNo==0) {
@@ -90,11 +95,14 @@ public class MusicFavoriteController extends BaseController {
                 pageSize = 10;
             }
 
-            PageHelper.startPage(pageNo,pageSize);
-            return succeed(musicFavoriteService.findList(musicFavorite));
+            LambdaQueryWrapper<MusicFavorite> lambdaQueryWrapper = Wrappers.lambdaQuery();
+            //lambdaQueryWrapper.like(MusicFavorite::getName , "k");
+
+            Page<MusicFavorite> page = new Page<>(pageNo,pageSize);
+            return succeed(musicFavoriteService.page(page, lambdaQueryWrapper));
         } catch (Exception e) {
             e.printStackTrace();
-            return null;
+            return HttpResponseResult.failed(e.getMessage());
         }
     }
 }

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

@@ -1,26 +1,31 @@
 package com.yonge.cooleshow.admin.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import javax.validation.Valid;
-import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.dto.MusicSheetAccompanimentDto;
 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 org.springframework.web.bind.annotation.RequestMapping;
 import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.biz.dal.entity.MusicSheetAccompaniment;
 import com.yonge.cooleshow.biz.dal.service.MusicSheetAccompanimentService;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 
 /**
  * 曲谱伴奏表 web 控制层
  * @author yzp
- * @date 2022-03-22 16:40:36
+ * @date 2022-03-26 00:21:46
  * @version v1.0
  **/
 @RestController
-@RequestMapping("/admin/music/detail")
-@Api(tags = "曲谱伴奏表 web 控制层")
+@RequestMapping("/music/sheet/accompaniment")
+@Api(tags = "曲谱伴奏表 API接口")
 public class MusicSheetAccompanimentController extends BaseController {
     @Autowired
     private SysUserFeignService sysUserFeignService;
@@ -28,9 +33,9 @@ public class MusicSheetAccompanimentController extends BaseController {
 	@Autowired
 	private MusicSheetAccompanimentService musicSheetAccompanimentService;
 
-	@ApiOperation(value = "新增")
-    @PostMapping("/create")
-    public Object create(@Valid @RequestBody MusicSheetAccompaniment musicSheetAccompaniment) {
+	@ApiOperation(value = "新增", httpMethod="POST", consumes="application/json", produces="application/json")
+    @PostMapping(value="/create", consumes="application/json", produces="application/json")
+    public HttpResponseResult<Object> create(@Valid @RequestBody MusicSheetAccompaniment musicSheetAccompaniment) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");
@@ -38,11 +43,11 @@ public class MusicSheetAccompanimentController extends BaseController {
 
         //musicSheetAccompaniment.setCreateBy(sysUser.getId());
         //musicSheetAccompaniment.setCreateTime(new Date());
-        musicSheetAccompanimentService.insert(musicSheetAccompaniment);
+        musicSheetAccompanimentService.save(musicSheetAccompaniment);
         return succeed();
     }
 
-    @ApiOperation(value = "删除")
+    @ApiOperation(value = "删除", httpMethod="POST", consumes="application/json", produces="application/json")
     @PostMapping("/delete/{id}")
     public Object delete(@PathVariable Long id) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
@@ -50,13 +55,13 @@ public class MusicSheetAccompanimentController extends BaseController {
             return failed("用户信息获取失败");
         }
 
-        musicSheetAccompanimentService.delete(id);
+        musicSheetAccompanimentService.removeById(id);
         return succeed();
     }
 
-    @ApiOperation(value = "修改")
-    @PostMapping("/update")
-    public Object update(@Valid @RequestBody MusicSheetAccompaniment musicSheetAccompaniment) {
+    @ApiOperation(value = "修改", httpMethod="POST", consumes="application/json", produces="application/json")
+    @PostMapping(value="/update", consumes="application/json", produces="application/json")
+    public HttpResponseResult<Object> update(@Valid @RequestBody MusicSheetAccompaniment musicSheetAccompaniment) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");
@@ -67,20 +72,20 @@ public class MusicSheetAccompanimentController extends BaseController {
 
         //musicSheetAccompaniment.setUpdateBy(sysUser.getId());
         //musicSheetAccompaniment.setUpdateTime(new Date());
-        musicSheetAccompanimentService.update(musicSheetAccompaniment);
+        musicSheetAccompanimentService.updateById(musicSheetAccompaniment);
         return succeed();
     }
 
-    @ApiOperation(value = "分页查询")
-    @PostMapping("/list")
-    public Object list(@RequestBody MusicSheetAccompaniment musicSheetAccompaniment) {
+    @ApiOperation(value = "分页查询", httpMethod="POST", consumes="application/json", produces="application/json")
+    @PostMapping(value="/list", consumes="application/json", produces="application/json")
+    public HttpResponseResult<Object> list(@RequestBody MusicSheetAccompanimentDto musicSheetAccompanimentDto) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
 
-        int pageNo = musicSheetAccompaniment.getPageNo();
-        int pageSize = musicSheetAccompaniment.getPageSize();
+        int pageNo = musicSheetAccompanimentDto.getPageNo();
+        int pageSize = musicSheetAccompanimentDto.getPageSize();
 
         try {
             if (pageNo==0) {
@@ -90,11 +95,14 @@ public class MusicSheetAccompanimentController extends BaseController {
                 pageSize = 10;
             }
 
-            PageHelper.startPage(pageNo,pageSize);
-            return succeed(musicSheetAccompanimentService.findList(musicSheetAccompaniment));
+            LambdaQueryWrapper<MusicSheetAccompaniment> lambdaQueryWrapper = Wrappers.lambdaQuery();
+            //lambdaQueryWrapper.like(MusicSheetAccompaniment::getName , "k");
+
+            Page<MusicSheetAccompaniment> page = new Page<>(pageNo,pageSize);
+            return succeed(musicSheetAccompanimentService.page(page, lambdaQueryWrapper));
         } catch (Exception e) {
             e.printStackTrace();
-            return null;
+            return HttpResponseResult.failed(e.getMessage());
         }
     }
 }

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

@@ -1,18 +1,23 @@
 package com.yonge.cooleshow.admin.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import javax.validation.Valid;
-import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.dto.MusicSheetDto;
 import com.yonge.cooleshow.biz.dal.entity.MusicSheetAccompaniment;
-import com.yonge.cooleshow.biz.dal.service.MusicSheetAccompanimentService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
 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 org.springframework.web.bind.annotation.RequestMapping;
 import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
 import com.yonge.cooleshow.biz.dal.service.MusicSheetService;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 
 import java.util.Date;
 import java.util.List;
@@ -20,12 +25,12 @@ import java.util.List;
 /**
  * 曲谱表 web 控制层
  * @author yzp
- * @date 2022-03-22 16:40:36
+ * @date 2022-03-26 00:21:46
  * @version v1.0
  **/
 @RestController
-@RequestMapping("/admin/music/sheet")
-@Api(tags = "曲谱表 web 控制层")
+@RequestMapping("/music/sheet")
+@Api(tags = "曲谱表 API接口")
 public class MusicSheetController extends BaseController {
     @Autowired
     private SysUserFeignService sysUserFeignService;
@@ -33,44 +38,43 @@ public class MusicSheetController extends BaseController {
 	@Autowired
 	private MusicSheetService musicSheetService;
 
-	@Autowired
-    private MusicSheetAccompanimentService musicSheetAccompanimentService;
-
-	@ApiOperation(value = "新增曲谱")
-    @RequestMapping(value = "/create", method = RequestMethod.POST, consumes="application/json", produces="application/json")
-    public Object create(@Valid @RequestBody MusicSheet musicSheet) {
+	@ApiOperation(value = "新增", httpMethod="POST", consumes="application/json", produces="application/json")
+    @PostMapping(value="/create", consumes="application/json", produces="application/json")
+    public HttpResponseResult<Object> create(@Valid @RequestBody MusicSheetDto musicSheetDto) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
 
+        if (musicSheetDto.getChargeType()==2 && musicSheetDto.getMusicPrice()==null){
+            return failed("此曲谱为收费曲谱，需要提供价格");
+        }
+
         List<MusicSheetAccompaniment> list = null;
-        if (!musicSheet.getAudioType().equalsIgnoreCase("midi")){
-            list = musicSheet.getBackground();
+        if (!musicSheetDto.getAudioType().equalsIgnoreCase("midi")){
+            list = musicSheetDto.getBackground();
             if (list.isEmpty()){
                 return failed("mp3音频文件对应的主音或者伴奏文件没有提供");
             }
+        } else {
+            MusicSheet musicSheet = new MusicSheet();
+            BeanUtils.copyProperties(musicSheetDto, musicSheet);
+            musicSheet.setAuditStatus(0);
+            musicSheet.setCreateBy(sysUser.getId());
+            musicSheet.setUserId(sysUser.getId());
+            musicSheet.setCreateTime(new Date());
+            musicSheetService.save(musicSheet);
         }
 
-        musicSheet.setCreateBy(sysUser.getId());
-        musicSheet.setCreateTime(new Date());
-        musicSheetService.insert(musicSheet);
-
-        Long sheetId = musicSheet.getId();
-        if (!musicSheet.getAudioType().equalsIgnoreCase("midi")) {
-            for (int i = 0; i < list.size(); i++) {
-                MusicSheetAccompaniment musicSheetAccompaniment = list.get(i);
-                musicSheetAccompaniment.setCreateBy(sysUser.getId());
-                musicSheetAccompaniment.setCreateTime(new Date());
-                musicSheetAccompaniment.setMusicSheetId(sheetId);
-                musicSheetAccompanimentService.insert(musicSheetAccompaniment);
-            }
+        boolean result = musicSheetService.saveMp3AndAccompaniment(musicSheetDto,sysUser);
+        if (result) {
+            return succeed("新增曲谱成功");
+        } else {
+            return failed("新增曲谱失败");
         }
-
-        return succeed("曲谱创建成功");
     }
 
-    @ApiOperation(value = "删除曲谱")
+    @ApiOperation(value = "删除", httpMethod="POST", consumes="application/json", produces="application/json")
     @PostMapping("/delete/{id}")
     public Object delete(@PathVariable Long id) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
@@ -78,13 +82,17 @@ public class MusicSheetController extends BaseController {
             return failed("用户信息获取失败");
         }
 
-        musicSheetService.delete(id);
-        return succeed();
+        boolean result = musicSheetService.removeById(id);
+        if (result){
+            return succeed("删除成功");
+        } else {
+            return failed("删除失败");
+        }
     }
 
-    @ApiOperation(value = "修改曲谱")
-    @PostMapping("/update")
-    public Object update(@Valid @RequestBody MusicSheet musicSheet) {
+    @ApiOperation(value = "修改", httpMethod="POST", consumes="application/json", produces="application/json")
+    @PostMapping(value="/update", consumes="application/json", produces="application/json")
+    public HttpResponseResult<Object> update(@Valid @RequestBody MusicSheet musicSheet) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");
@@ -93,36 +101,50 @@ public class MusicSheetController extends BaseController {
             return failed("缺少ID");
         }
 
-        //musicSheet.setUpdateBy(sysUser.getId());
-        //musicSheet.setUpdateTime(new Date());
-        musicSheetService.update(musicSheet);
-        return succeed();
+        musicSheet.setUpdateBy(sysUser.getId());
+        musicSheet.setUpdateTime(new Date());
+        boolean result = musicSheetService.updateById(musicSheet);
+        if (result){
+            return succeed("修改成功");
+        } else {
+            return failed("修改失败");
+        }
     }
 
-    @ApiOperation(value = "曲谱分页查询")
-    @PostMapping("/list")
-    public Object list(@RequestBody MusicSheet musicSheet) {
+    @ApiOperation(value = "分页查询", httpMethod="POST", consumes="application/json", produces="application/json")
+    @PostMapping(value="/list", consumes="application/json", produces="application/json")
+    public HttpResponseResult<Object> list(@RequestBody MusicSheetDto musicSheetDto) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
 
-        int pageNo = musicSheet.getPageNo();
-        int pageSize = musicSheet.getPageSize();
+        int pageNo;
+        int pageSize;
 
         try {
-            if (pageNo==0) {
+            if (musicSheetDto.getPageNo() ==null || musicSheetDto.getPageNo() ==0) {
                 pageNo = 1;
+            } else {
+                pageNo = musicSheetDto.getPageNo();
             }
-            if (pageSize==0) {
+            if (musicSheetDto.getPageSize() ==null || musicSheetDto.getPageSize() ==0) {
                 pageSize = 10;
+            } else {
+                pageSize = musicSheetDto.getPageSize();
             }
 
-            PageHelper.startPage(pageNo,pageSize);
-            return succeed(musicSheetService.findList(musicSheet));
+            LambdaQueryWrapper<MusicSheet> lambdaQueryWrapper = Wrappers.lambdaQuery();
+            lambdaQueryWrapper.or().like(MusicSheet::getMusicSheetName , musicSheetDto.getSearch());
+            lambdaQueryWrapper.or().like(MusicSheet::getComposer , musicSheetDto.getSearch());
+            lambdaQueryWrapper.or().like(MusicSheet::getMusicTag , musicSheetDto.getSearch());
+            lambdaQueryWrapper.or().like(MusicSheet::getMusicSubject , musicSheetDto.getSearch());
+
+            Page<MusicSheet> page = new Page<>(pageNo,pageSize);
+            return succeed(musicSheetService.page(page, lambdaQueryWrapper));
         } catch (Exception e) {
             e.printStackTrace();
-            return null;
+            return HttpResponseResult.failed(e.getMessage());
         }
     }
 }

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

@@ -1,26 +1,31 @@
 package com.yonge.cooleshow.admin.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import javax.validation.Valid;
-import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.dto.MusicSheetPurchaseRecordDto;
 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 org.springframework.web.bind.annotation.RequestMapping;
 import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.biz.dal.entity.MusicSheetPurchaseRecord;
 import com.yonge.cooleshow.biz.dal.service.MusicSheetPurchaseRecordService;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 
 /**
  * 曲谱购买记录表 web 控制层
  * @author yzp
- * @date 2022-03-22 16:40:36
+ * @date 2022-03-26 00:21:46
  * @version v1.0
  **/
 @RestController
-@RequestMapping("/admin/music/buy/record")
-@Api(tags = "曲谱购买记录表 web 控制层")
+@RequestMapping("/music/sheet/purchase/record")
+@Api(tags = "曲谱购买记录表 API接口")
 public class MusicSheetPurchaseRecordController extends BaseController {
     @Autowired
     private SysUserFeignService sysUserFeignService;
@@ -28,9 +33,9 @@ public class MusicSheetPurchaseRecordController extends BaseController {
 	@Autowired
 	private MusicSheetPurchaseRecordService musicSheetPurchaseRecordService;
 
-	@ApiOperation(value = "新增")
-    @PostMapping("/create")
-    public Object create(@Valid @RequestBody MusicSheetPurchaseRecord musicSheetPurchaseRecord) {
+	@ApiOperation(value = "新增", httpMethod="POST", consumes="application/json", produces="application/json")
+    @PostMapping(value="/create", consumes="application/json", produces="application/json")
+    public HttpResponseResult<Object> create(@Valid @RequestBody MusicSheetPurchaseRecord musicSheetPurchaseRecord) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");
@@ -38,11 +43,11 @@ public class MusicSheetPurchaseRecordController extends BaseController {
 
         //musicSheetPurchaseRecord.setCreateBy(sysUser.getId());
         //musicSheetPurchaseRecord.setCreateTime(new Date());
-        musicSheetPurchaseRecordService.insert(musicSheetPurchaseRecord);
+        musicSheetPurchaseRecordService.save(musicSheetPurchaseRecord);
         return succeed();
     }
 
-    @ApiOperation(value = "删除")
+    @ApiOperation(value = "删除", httpMethod="POST", consumes="application/json", produces="application/json")
     @PostMapping("/delete/{id}")
     public Object delete(@PathVariable Long id) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
@@ -50,13 +55,13 @@ public class MusicSheetPurchaseRecordController extends BaseController {
             return failed("用户信息获取失败");
         }
 
-        musicSheetPurchaseRecordService.delete(id);
+        musicSheetPurchaseRecordService.removeById(id);
         return succeed();
     }
 
-    @ApiOperation(value = "修改")
-    @PostMapping("/update")
-    public Object update(@Valid @RequestBody MusicSheetPurchaseRecord musicSheetPurchaseRecord) {
+    @ApiOperation(value = "修改", httpMethod="POST", consumes="application/json", produces="application/json")
+    @PostMapping(value="/update", consumes="application/json", produces="application/json")
+    public HttpResponseResult<Object> update(@Valid @RequestBody MusicSheetPurchaseRecord musicSheetPurchaseRecord) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");
@@ -67,20 +72,20 @@ public class MusicSheetPurchaseRecordController extends BaseController {
 
         //musicSheetPurchaseRecord.setUpdateBy(sysUser.getId());
         //musicSheetPurchaseRecord.setUpdateTime(new Date());
-        musicSheetPurchaseRecordService.update(musicSheetPurchaseRecord);
+        musicSheetPurchaseRecordService.updateById(musicSheetPurchaseRecord);
         return succeed();
     }
 
-    @ApiOperation(value = "分页查询")
-    @PostMapping("/list")
-    public Object list(@RequestBody MusicSheetPurchaseRecord musicSheetPurchaseRecord) {
+    @ApiOperation(value = "分页查询", httpMethod="POST", consumes="application/json", produces="application/json")
+    @PostMapping(value="/list", consumes="application/json", produces="application/json")
+    public HttpResponseResult<Object> list(@RequestBody MusicSheetPurchaseRecordDto musicSheetPurchaseRecordDto) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
 
-        int pageNo = musicSheetPurchaseRecord.getPageNo();
-        int pageSize = musicSheetPurchaseRecord.getPageSize();
+        int pageNo = musicSheetPurchaseRecordDto.getPageNo();
+        int pageSize = musicSheetPurchaseRecordDto.getPageSize();
 
         try {
             if (pageNo==0) {
@@ -90,11 +95,14 @@ public class MusicSheetPurchaseRecordController extends BaseController {
                 pageSize = 10;
             }
 
-            PageHelper.startPage(pageNo,pageSize);
-            return succeed(musicSheetPurchaseRecordService.findList(musicSheetPurchaseRecord));
+            LambdaQueryWrapper<MusicSheetPurchaseRecord> lambdaQueryWrapper = Wrappers.lambdaQuery();
+            //lambdaQueryWrapper.like(MusicSheetPurchaseRecord::getName , "k");
+
+            Page<MusicSheetPurchaseRecord> page = new Page<>(pageNo,pageSize);
+            return succeed(musicSheetPurchaseRecordService.page(page, lambdaQueryWrapper));
         } catch (Exception e) {
             e.printStackTrace();
-            return null;
+            return HttpResponseResult.failed(e.getMessage());
         }
     }
 }

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

@@ -22,7 +22,7 @@ import javax.validation.Valid;
 import java.util.List;
 
 @RestController
-@RequestMapping("/Student")
+@RequestMapping("/student")
 @Api(value = "学生表", tags = "学生表")
 public class StudentController extends BaseController {
     @Autowired

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

@@ -71,7 +71,7 @@ public class SysConfigController extends BaseController {
 		if (StringUtils.isBlank(config.getParamName())) {
 			return failed("参数名称不能为空");
 		}
-		if (StringUtils.isBlank(config.getParanValue())) {
+		if (StringUtils.isBlank(config.getParamValue())) {
 			return failed("参数值不能为空");
 		}
 		config.setCreateOn(new Date());

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

@@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.validation.Valid;
 
 @RestController
-@RequestMapping("/TeacherAuthEntryRecord")
+@RequestMapping("/teacherAuthEntryRecord")
 @Api(value = "老师入驻审核表", tags = "老师入驻审核表")
 public class TeacherAuthEntryRecordController extends BaseController {
     @Autowired

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

@@ -25,7 +25,7 @@ import javax.validation.Valid;
 import java.util.List;
 
 @RestController
-@RequestMapping("/TeacherAuthMusicianRecord")
+@RequestMapping("/teacherAuthMusicianRecord")
 @Api(value = "老师音乐人审核表", tags = "老师音乐人审核表")
 public class TeacherAuthMusicianRecordController extends BaseController {
 

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

@@ -24,7 +24,7 @@ import javax.validation.Valid;
 import java.util.List;
 
 @RestController
-@RequestMapping("/Teacher")
+@RequestMapping("/teacher")
 @Api(value = "教师表", tags = "教师表")
 public class TeacherController extends BaseController {
 

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

@@ -1,26 +1,32 @@
 package com.yonge.cooleshow.admin.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import javax.validation.Valid;
-import com.yonge.cooleshow.auth.api.entity.SysUser;
+
+import com.yonge.cooleshow.biz.dal.dto.VideoLessonEvaluateDto;
 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 org.springframework.web.bind.annotation.RequestMapping;
 import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.biz.dal.entity.VideoLessonEvaluate;
 import com.yonge.cooleshow.biz.dal.service.VideoLessonEvaluateService;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 
 /**
  * 视频课学员评价 web 控制层
  * @author yzp
- * @date 2022-03-22 16:40:36
+ * @date 2022-03-26 00:21:46
  * @version v1.0
  **/
 @RestController
-@RequestMapping("/admin/videolesson/evaluate")
-@Api(tags = "视频课学员评价 web 控制层")
+@RequestMapping("/video/lesson/evaluate")
+@Api(tags = "视频课学员评价 API接口")
 public class VideoLessonEvaluateController extends BaseController {
     @Autowired
     private SysUserFeignService sysUserFeignService;
@@ -28,9 +34,9 @@ public class VideoLessonEvaluateController extends BaseController {
 	@Autowired
 	private VideoLessonEvaluateService videoLessonEvaluateService;
 
-	@ApiOperation(value = "新增")
-    @PostMapping("/create")
-    public Object create(@Valid @RequestBody VideoLessonEvaluate videoLessonEvaluate) {
+	@ApiOperation(value = "新增", httpMethod="POST", consumes="application/json", produces="application/json")
+    @PostMapping(value="/create", consumes="application/json", produces="application/json")
+    public HttpResponseResult<Object> create(@Valid @RequestBody VideoLessonEvaluate videoLessonEvaluate) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");
@@ -38,11 +44,11 @@ public class VideoLessonEvaluateController extends BaseController {
 
         //videoLessonEvaluate.setCreateBy(sysUser.getId());
         //videoLessonEvaluate.setCreateTime(new Date());
-        videoLessonEvaluateService.insert(videoLessonEvaluate);
+        videoLessonEvaluateService.save(videoLessonEvaluate);
         return succeed();
     }
 
-    @ApiOperation(value = "删除")
+    @ApiOperation(value = "删除", httpMethod="POST", consumes="application/json", produces="application/json")
     @PostMapping("/delete/{id}")
     public Object delete(@PathVariable Long id) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
@@ -50,13 +56,13 @@ public class VideoLessonEvaluateController extends BaseController {
             return failed("用户信息获取失败");
         }
 
-        videoLessonEvaluateService.delete(id);
+        videoLessonEvaluateService.removeById(id);
         return succeed();
     }
 
-    @ApiOperation(value = "修改")
-    @PostMapping("/update")
-    public Object update(@Valid @RequestBody VideoLessonEvaluate videoLessonEvaluate) {
+    @ApiOperation(value = "修改", httpMethod="POST", consumes="application/json", produces="application/json")
+    @PostMapping(value="/update", consumes="application/json", produces="application/json")
+    public HttpResponseResult<Object> update(@Valid @RequestBody VideoLessonEvaluate videoLessonEvaluate) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");
@@ -67,20 +73,20 @@ public class VideoLessonEvaluateController extends BaseController {
 
         //videoLessonEvaluate.setUpdateBy(sysUser.getId());
         //videoLessonEvaluate.setUpdateTime(new Date());
-        videoLessonEvaluateService.update(videoLessonEvaluate);
+        videoLessonEvaluateService.updateById(videoLessonEvaluate);
         return succeed();
     }
 
-    @ApiOperation(value = "分页查询")
-    @PostMapping("/list")
-    public Object list(@RequestBody VideoLessonEvaluate videoLessonEvaluate) {
+    @ApiOperation(value = "分页查询", httpMethod="POST", consumes="application/json", produces="application/json")
+    @PostMapping(value="/list", consumes="application/json", produces="application/json")
+    public HttpResponseResult<Object> list(@RequestBody VideoLessonEvaluateDto videoLessonEvaluateDto) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
 
-        int pageNo = videoLessonEvaluate.getPageNo();
-        int pageSize = videoLessonEvaluate.getPageSize();
+        int pageNo = videoLessonEvaluateDto.getPageNo();
+        int pageSize = videoLessonEvaluateDto.getPageSize();
 
         try {
             if (pageNo==0) {
@@ -90,11 +96,14 @@ public class VideoLessonEvaluateController extends BaseController {
                 pageSize = 10;
             }
 
-            PageHelper.startPage(pageNo,pageSize);
-            return succeed(videoLessonEvaluateService.findList(videoLessonEvaluate));
+            LambdaQueryWrapper<VideoLessonEvaluate> lambdaQueryWrapper = Wrappers.lambdaQuery();
+            //lambdaQueryWrapper.like(VideoLessonEvaluate::getName , "k");
+
+            Page<VideoLessonEvaluate> page = new Page<>(pageNo,pageSize);
+            return succeed(videoLessonEvaluateService.page(page, lambdaQueryWrapper));
         } catch (Exception e) {
             e.printStackTrace();
-            return null;
+            return HttpResponseResult.failed(e.getMessage());
         }
     }
 }

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

@@ -1,26 +1,31 @@
 package com.yonge.cooleshow.admin.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import javax.validation.Valid;
-import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.dto.VideoLessonGroupDto;
 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 org.springframework.web.bind.annotation.RequestMapping;
 import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.biz.dal.entity.VideoLessonGroup;
 import com.yonge.cooleshow.biz.dal.service.VideoLessonGroupService;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 
 /**
  * 视频课基本信息表 web 控制层
  * @author yzp
- * @date 2022-03-22 16:40:36
+ * @date 2022-03-26 00:21:46
  * @version v1.0
  **/
 @RestController
-@RequestMapping("/admin/videolesson/group")
-@Api(tags = "视频课基本信息表 web 控制层")
+@RequestMapping("/video/lesson/group")
+@Api(tags = "视频课基本信息表 API接口")
 public class VideoLessonGroupController extends BaseController {
     @Autowired
     private SysUserFeignService sysUserFeignService;
@@ -28,9 +33,9 @@ public class VideoLessonGroupController extends BaseController {
 	@Autowired
 	private VideoLessonGroupService videoLessonGroupService;
 
-	@ApiOperation(value = "新增")
-    @PostMapping("/create")
-    public Object create(@Valid @RequestBody VideoLessonGroup videoLessonGroup) {
+	@ApiOperation(value = "新增", httpMethod="POST", consumes="application/json", produces="application/json")
+    @PostMapping(value="/create", consumes="application/json", produces="application/json")
+    public HttpResponseResult<Object> create(@Valid @RequestBody VideoLessonGroup videoLessonGroup) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");
@@ -38,11 +43,11 @@ public class VideoLessonGroupController extends BaseController {
 
         //videoLessonGroup.setCreateBy(sysUser.getId());
         //videoLessonGroup.setCreateTime(new Date());
-        videoLessonGroupService.insert(videoLessonGroup);
+        videoLessonGroupService.save(videoLessonGroup);
         return succeed();
     }
 
-    @ApiOperation(value = "删除")
+    @ApiOperation(value = "删除", httpMethod="POST", consumes="application/json", produces="application/json")
     @PostMapping("/delete/{id}")
     public Object delete(@PathVariable Long id) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
@@ -50,13 +55,13 @@ public class VideoLessonGroupController extends BaseController {
             return failed("用户信息获取失败");
         }
 
-        videoLessonGroupService.delete(id);
+        videoLessonGroupService.removeById(id);
         return succeed();
     }
 
-    @ApiOperation(value = "修改")
-    @PostMapping("/update")
-    public Object update(@Valid @RequestBody VideoLessonGroup videoLessonGroup) {
+    @ApiOperation(value = "修改", httpMethod="POST", consumes="application/json", produces="application/json")
+    @PostMapping(value="/update", consumes="application/json", produces="application/json")
+    public HttpResponseResult<Object> update(@Valid @RequestBody VideoLessonGroup videoLessonGroup) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");
@@ -67,20 +72,20 @@ public class VideoLessonGroupController extends BaseController {
 
         //videoLessonGroup.setUpdateBy(sysUser.getId());
         //videoLessonGroup.setUpdateTime(new Date());
-        videoLessonGroupService.update(videoLessonGroup);
+        videoLessonGroupService.updateById(videoLessonGroup);
         return succeed();
     }
 
-    @ApiOperation(value = "分页查询")
-    @PostMapping("/list")
-    public Object list(@RequestBody VideoLessonGroup videoLessonGroup) {
+    @ApiOperation(value = "分页查询", httpMethod="POST", consumes="application/json", produces="application/json")
+    @PostMapping(value="/list", consumes="application/json", produces="application/json")
+    public HttpResponseResult<Object> list(@RequestBody VideoLessonGroupDto videoLessonGroupDto) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
 
-        int pageNo = videoLessonGroup.getPageNo();
-        int pageSize = videoLessonGroup.getPageSize();
+        int pageNo = videoLessonGroupDto.getPageNo();
+        int pageSize = videoLessonGroupDto.getPageSize();
 
         try {
             if (pageNo==0) {
@@ -90,11 +95,14 @@ public class VideoLessonGroupController extends BaseController {
                 pageSize = 10;
             }
 
-            PageHelper.startPage(pageNo,pageSize);
-            return succeed(videoLessonGroupService.findList(videoLessonGroup));
+            LambdaQueryWrapper<VideoLessonGroup> lambdaQueryWrapper = Wrappers.lambdaQuery();
+            //lambdaQueryWrapper.like(VideoLessonGroup::getName , "k");
+
+            Page<VideoLessonGroup> page = new Page<>(pageNo,pageSize);
+            return succeed(videoLessonGroupService.page(page, lambdaQueryWrapper));
         } catch (Exception e) {
             e.printStackTrace();
-            return null;
+            return HttpResponseResult.failed(e.getMessage());
         }
     }
 }

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

@@ -1,26 +1,31 @@
 package com.yonge.cooleshow.admin.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import javax.validation.Valid;
-import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.dto.VideoLessonGroupDetailDto;
 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 org.springframework.web.bind.annotation.RequestMapping;
 import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.biz.dal.entity.VideoLessonGroupDetail;
 import com.yonge.cooleshow.biz.dal.service.VideoLessonGroupDetailService;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 
 /**
  * 视频课明细表 web 控制层
  * @author yzp
- * @date 2022-03-22 16:40:36
+ * @date 2022-03-26 00:21:46
  * @version v1.0
  **/
 @RestController
-@RequestMapping("/admin/videolesson/group/detail")
-@Api(tags = "视频课明细表 web 控制层")
+@RequestMapping("/video/lesson/group/detail")
+@Api(tags = "视频课明细表 API接口")
 public class VideoLessonGroupDetailController extends BaseController {
     @Autowired
     private SysUserFeignService sysUserFeignService;
@@ -28,9 +33,9 @@ public class VideoLessonGroupDetailController extends BaseController {
 	@Autowired
 	private VideoLessonGroupDetailService videoLessonGroupDetailService;
 
-	@ApiOperation(value = "新增")
-    @PostMapping("/create")
-    public Object create(@Valid @RequestBody VideoLessonGroupDetail videoLessonGroupDetail) {
+	@ApiOperation(value = "新增", httpMethod="POST", consumes="application/json", produces="application/json")
+    @PostMapping(value="/create", consumes="application/json", produces="application/json")
+    public HttpResponseResult<Object> create(@Valid @RequestBody VideoLessonGroupDetail videoLessonGroupDetail) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");
@@ -38,11 +43,11 @@ public class VideoLessonGroupDetailController extends BaseController {
 
         //videoLessonGroupDetail.setCreateBy(sysUser.getId());
         //videoLessonGroupDetail.setCreateTime(new Date());
-        videoLessonGroupDetailService.insert(videoLessonGroupDetail);
+        videoLessonGroupDetailService.save(videoLessonGroupDetail);
         return succeed();
     }
 
-    @ApiOperation(value = "删除")
+    @ApiOperation(value = "删除", httpMethod="POST", consumes="application/json", produces="application/json")
     @PostMapping("/delete/{id}")
     public Object delete(@PathVariable Long id) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
@@ -50,13 +55,13 @@ public class VideoLessonGroupDetailController extends BaseController {
             return failed("用户信息获取失败");
         }
 
-        videoLessonGroupDetailService.delete(id);
+        videoLessonGroupDetailService.removeById(id);
         return succeed();
     }
 
-    @ApiOperation(value = "修改")
-    @PostMapping("/update")
-    public Object update(@Valid @RequestBody VideoLessonGroupDetail videoLessonGroupDetail) {
+    @ApiOperation(value = "修改", httpMethod="POST", consumes="application/json", produces="application/json")
+    @PostMapping(value="/update", consumes="application/json", produces="application/json")
+    public HttpResponseResult<Object> update(@Valid @RequestBody VideoLessonGroupDetail videoLessonGroupDetail) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");
@@ -67,20 +72,20 @@ public class VideoLessonGroupDetailController extends BaseController {
 
         //videoLessonGroupDetail.setUpdateBy(sysUser.getId());
         //videoLessonGroupDetail.setUpdateTime(new Date());
-        videoLessonGroupDetailService.update(videoLessonGroupDetail);
+        videoLessonGroupDetailService.updateById(videoLessonGroupDetail);
         return succeed();
     }
 
-    @ApiOperation(value = "分页查询")
-    @PostMapping("/list")
-    public Object list(@RequestBody VideoLessonGroupDetail videoLessonGroupDetail) {
+    @ApiOperation(value = "分页查询", httpMethod="POST", consumes="application/json", produces="application/json")
+    @PostMapping(value="/list", consumes="application/json", produces="application/json")
+    public HttpResponseResult<Object> list(@RequestBody VideoLessonGroupDetailDto videoLessonGroupDetailDto) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
 
-        int pageNo = videoLessonGroupDetail.getPageNo();
-        int pageSize = videoLessonGroupDetail.getPageSize();
+        int pageNo = videoLessonGroupDetailDto.getPageNo();
+        int pageSize = videoLessonGroupDetailDto.getPageSize();
 
         try {
             if (pageNo==0) {
@@ -90,11 +95,14 @@ public class VideoLessonGroupDetailController extends BaseController {
                 pageSize = 10;
             }
 
-            PageHelper.startPage(pageNo,pageSize);
-            return succeed(videoLessonGroupDetailService.findList(videoLessonGroupDetail));
+            LambdaQueryWrapper<VideoLessonGroupDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
+            //lambdaQueryWrapper.like(VideoLessonGroupDetail::getName , "k");
+
+            Page<VideoLessonGroupDetail> page = new Page<>(pageNo,pageSize);
+            return succeed(videoLessonGroupDetailService.page(page, lambdaQueryWrapper));
         } catch (Exception e) {
             e.printStackTrace();
-            return null;
+            return HttpResponseResult.failed(e.getMessage());
         }
     }
 }

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

@@ -1,26 +1,31 @@
 package com.yonge.cooleshow.admin.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import javax.validation.Valid;
-import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.dto.VideoLessonPurchaseRecordDto;
 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 org.springframework.web.bind.annotation.RequestMapping;
 import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.biz.dal.entity.VideoLessonPurchaseRecord;
 import com.yonge.cooleshow.biz.dal.service.VideoLessonPurchaseRecordService;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 
 /**
  * 视频课购买记录表 web 控制层
  * @author yzp
- * @date 2022-03-22 16:40:36
+ * @date 2022-03-26 00:21:46
  * @version v1.0
  **/
 @RestController
-@RequestMapping("/admin/videolesson/buy/record")
-@Api(tags = "视频课购买记录表 web 控制层")
+@RequestMapping("/video/lesson/purchase/record")
+@Api(tags = "视频课购买记录表 API接口")
 public class VideoLessonPurchaseRecordController extends BaseController {
     @Autowired
     private SysUserFeignService sysUserFeignService;
@@ -28,9 +33,9 @@ public class VideoLessonPurchaseRecordController extends BaseController {
 	@Autowired
 	private VideoLessonPurchaseRecordService videoLessonPurchaseRecordService;
 
-	@ApiOperation(value = "新增")
-    @PostMapping("/create")
-    public Object create(@Valid @RequestBody VideoLessonPurchaseRecord videoLessonPurchaseRecord) {
+	@ApiOperation(value = "新增", httpMethod="POST", consumes="application/json", produces="application/json")
+    @PostMapping(value="/create", consumes="application/json", produces="application/json")
+    public HttpResponseResult<Object> create(@Valid @RequestBody VideoLessonPurchaseRecord videoLessonPurchaseRecord) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");
@@ -38,11 +43,11 @@ public class VideoLessonPurchaseRecordController extends BaseController {
 
         //videoLessonPurchaseRecord.setCreateBy(sysUser.getId());
         //videoLessonPurchaseRecord.setCreateTime(new Date());
-        videoLessonPurchaseRecordService.insert(videoLessonPurchaseRecord);
+        videoLessonPurchaseRecordService.save(videoLessonPurchaseRecord);
         return succeed();
     }
 
-    @ApiOperation(value = "删除")
+    @ApiOperation(value = "删除", httpMethod="POST", consumes="application/json", produces="application/json")
     @PostMapping("/delete/{id}")
     public Object delete(@PathVariable Long id) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
@@ -50,13 +55,13 @@ public class VideoLessonPurchaseRecordController extends BaseController {
             return failed("用户信息获取失败");
         }
 
-        videoLessonPurchaseRecordService.delete(id);
+        videoLessonPurchaseRecordService.removeById(id);
         return succeed();
     }
 
-    @ApiOperation(value = "修改")
-    @PostMapping("/update")
-    public Object update(@Valid @RequestBody VideoLessonPurchaseRecord videoLessonPurchaseRecord) {
+    @ApiOperation(value = "修改", httpMethod="POST", consumes="application/json", produces="application/json")
+    @PostMapping(value="/update", consumes="application/json", produces="application/json")
+    public HttpResponseResult<Object> update(@Valid @RequestBody VideoLessonPurchaseRecord videoLessonPurchaseRecord) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");
@@ -67,20 +72,20 @@ public class VideoLessonPurchaseRecordController extends BaseController {
 
         //videoLessonPurchaseRecord.setUpdateBy(sysUser.getId());
         //videoLessonPurchaseRecord.setUpdateTime(new Date());
-        videoLessonPurchaseRecordService.update(videoLessonPurchaseRecord);
+        videoLessonPurchaseRecordService.updateById(videoLessonPurchaseRecord);
         return succeed();
     }
 
-    @ApiOperation(value = "分页查询")
-    @PostMapping("/list")
-    public Object list(@RequestBody VideoLessonPurchaseRecord videoLessonPurchaseRecord) {
+    @ApiOperation(value = "分页查询", httpMethod="POST", consumes="application/json", produces="application/json")
+    @PostMapping(value="/list", consumes="application/json", produces="application/json")
+    public HttpResponseResult<Object> list(@RequestBody VideoLessonPurchaseRecordDto videoLessonPurchaseRecordDto) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
 
-        int pageNo = videoLessonPurchaseRecord.getPageNo();
-        int pageSize = videoLessonPurchaseRecord.getPageSize();
+        int pageNo = videoLessonPurchaseRecordDto.getPageNo();
+        int pageSize = videoLessonPurchaseRecordDto.getPageSize();
 
         try {
             if (pageNo==0) {
@@ -90,11 +95,14 @@ public class VideoLessonPurchaseRecordController extends BaseController {
                 pageSize = 10;
             }
 
-            PageHelper.startPage(pageNo,pageSize);
-            return succeed(videoLessonPurchaseRecordService.findList(videoLessonPurchaseRecord));
+            LambdaQueryWrapper<VideoLessonPurchaseRecord> lambdaQueryWrapper = Wrappers.lambdaQuery();
+            //lambdaQueryWrapper.like(VideoLessonPurchaseRecord::getName , "k");
+
+            Page<VideoLessonPurchaseRecord> page = new Page<>(pageNo,pageSize);
+            return succeed(videoLessonPurchaseRecordService.page(page, lambdaQueryWrapper));
         } catch (Exception e) {
             e.printStackTrace();
-            return null;
+            return HttpResponseResult.failed(e.getMessage());
         }
     }
 }

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

@@ -1,26 +1,31 @@
 package com.yonge.cooleshow.admin.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import javax.validation.Valid;
-import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.dto.VideoLessonStudyRecordDto;
 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 org.springframework.web.bind.annotation.RequestMapping;
 import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.biz.dal.entity.VideoLessonStudyRecord;
 import com.yonge.cooleshow.biz.dal.service.VideoLessonStudyRecordService;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 
 /**
  * 视频课学习记录表 web 控制层
  * @author yzp
- * @date 2022-03-22 16:40:36
+ * @date 2022-03-26 00:21:46
  * @version v1.0
  **/
 @RestController
-@RequestMapping("/admin/videolesson/study/record")
-@Api(tags = "视频课学习记录表 web 控制层")
+@RequestMapping("/video/lesson/study/record")
+@Api(tags = "视频课学习记录表 API接口")
 public class VideoLessonStudyRecordController extends BaseController {
     @Autowired
     private SysUserFeignService sysUserFeignService;
@@ -28,9 +33,9 @@ public class VideoLessonStudyRecordController extends BaseController {
 	@Autowired
 	private VideoLessonStudyRecordService videoLessonStudyRecordService;
 
-	@ApiOperation(value = "新增")
-    @PostMapping("/create")
-    public Object create(@Valid @RequestBody VideoLessonStudyRecord videoLessonStudyRecord) {
+	@ApiOperation(value = "新增", httpMethod="POST", consumes="application/json", produces="application/json")
+    @PostMapping(value="/create", consumes="application/json", produces="application/json")
+    public HttpResponseResult<Object> create(@Valid @RequestBody VideoLessonStudyRecord videoLessonStudyRecord) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");
@@ -38,11 +43,11 @@ public class VideoLessonStudyRecordController extends BaseController {
 
         //videoLessonStudyRecord.setCreateBy(sysUser.getId());
         //videoLessonStudyRecord.setCreateTime(new Date());
-        videoLessonStudyRecordService.insert(videoLessonStudyRecord);
+        videoLessonStudyRecordService.save(videoLessonStudyRecord);
         return succeed();
     }
 
-    @ApiOperation(value = "删除")
+    @ApiOperation(value = "删除", httpMethod="POST", consumes="application/json", produces="application/json")
     @PostMapping("/delete/{id}")
     public Object delete(@PathVariable Long id) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
@@ -50,13 +55,13 @@ public class VideoLessonStudyRecordController extends BaseController {
             return failed("用户信息获取失败");
         }
 
-        videoLessonStudyRecordService.delete(id);
+        videoLessonStudyRecordService.removeById(id);
         return succeed();
     }
 
-    @ApiOperation(value = "修改")
-    @PostMapping("/update")
-    public Object update(@Valid @RequestBody VideoLessonStudyRecord videoLessonStudyRecord) {
+    @ApiOperation(value = "修改", httpMethod="POST", consumes="application/json", produces="application/json")
+    @PostMapping(value="/update", consumes="application/json", produces="application/json")
+    public HttpResponseResult<Object> update(@Valid @RequestBody VideoLessonStudyRecord videoLessonStudyRecord) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");
@@ -67,20 +72,20 @@ public class VideoLessonStudyRecordController extends BaseController {
 
         //videoLessonStudyRecord.setUpdateBy(sysUser.getId());
         //videoLessonStudyRecord.setUpdateTime(new Date());
-        videoLessonStudyRecordService.update(videoLessonStudyRecord);
+        videoLessonStudyRecordService.updateById(videoLessonStudyRecord);
         return succeed();
     }
 
-    @ApiOperation(value = "分页查询")
-    @PostMapping("/list")
-    public Object list(@RequestBody VideoLessonStudyRecord videoLessonStudyRecord) {
+    @ApiOperation(value = "分页查询", httpMethod="POST", consumes="application/json", produces="application/json")
+    @PostMapping(value="/list", consumes="application/json", produces="application/json")
+    public HttpResponseResult<Object> list(@RequestBody VideoLessonStudyRecordDto videoLessonStudyRecordDto) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
 
-        int pageNo = videoLessonStudyRecord.getPageNo();
-        int pageSize = videoLessonStudyRecord.getPageSize();
+        int pageNo = videoLessonStudyRecordDto.getPageNo();
+        int pageSize = videoLessonStudyRecordDto.getPageSize();
 
         try {
             if (pageNo==0) {
@@ -90,11 +95,14 @@ public class VideoLessonStudyRecordController extends BaseController {
                 pageSize = 10;
             }
 
-            PageHelper.startPage(pageNo,pageSize);
-            return succeed(videoLessonStudyRecordService.findList(videoLessonStudyRecord));
+            LambdaQueryWrapper<VideoLessonStudyRecord> lambdaQueryWrapper = Wrappers.lambdaQuery();
+            //lambdaQueryWrapper.like(VideoLessonStudyRecord::getName , "k");
+
+            Page<VideoLessonStudyRecord> page = new Page<>(pageNo,pageSize);
+            return succeed(videoLessonStudyRecordService.page(page, lambdaQueryWrapper));
         } catch (Exception e) {
             e.printStackTrace();
-            return null;
+            return HttpResponseResult.failed(e.getMessage());
         }
     }
 }

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

@@ -1,16 +1,14 @@
 package com.yonge.cooleshow.biz.dal.dao;
 
 import com.yonge.cooleshow.biz.dal.entity.AlbumFavorite;
-import com.yonge.cooleshow.common.dal.BaseDAO;
-import org.apache.ibatis.annotations.Mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * AlbumFavoriteDao数据库访问类
  * @author yzp
- * @date 2022-03-22 16:07:40
+ * @date 2022-03-25 23:46:28
  * @version v1.0
  **/
-@Mapper
-public interface AlbumFavoriteDao extends BaseDAO<Long, AlbumFavorite> {
+public interface AlbumFavoriteDao extends BaseMapper<AlbumFavorite> {
 
 }

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

@@ -1,16 +1,14 @@
 package com.yonge.cooleshow.biz.dal.dao;
 
 import com.yonge.cooleshow.biz.dal.entity.AlbumMusicRelate;
-import com.yonge.cooleshow.common.dal.BaseDAO;
-import org.apache.ibatis.annotations.Mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * AlbumMusicRelateDao数据库访问类
  * @author yzp
- * @date 2022-03-22 16:07:40
+ * @date 2022-03-25 23:46:28
  * @version v1.0
  **/
-@Mapper
-public interface AlbumMusicRelateDao extends BaseDAO<Long, AlbumMusicRelate> {
+public interface AlbumMusicRelateDao extends BaseMapper<AlbumMusicRelate> {
 
 }

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

@@ -0,0 +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.CourseHomework;
+
+public interface CourseHomeworkDao extends BaseMapper<CourseHomework>{
+
+	/**
+	 * 自定义分页
+	 */
+	List<CourseHomework> selectPage(IPage page, CourseHomework courseHomework);
+	
+}

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

@@ -2,6 +2,7 @@ package com.yonge.cooleshow.biz.dal.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yonge.cooleshow.biz.dal.entity.CourseSchedule;
+import com.yonge.cooleshow.biz.dal.vo.TeacherTotalVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -15,6 +16,13 @@ import java.util.List;
 public interface CourseScheduleDao extends BaseMapper<CourseSchedule> {
 
     int insertBatch(@Param("entities") List<CourseSchedule> entities);
+    /***
+     * 查询所有老师课时统计
+     * @author liweifan
+     * @updateTime 2022/3/28 10:53
+     * @return: com.yonge.cooleshow.biz.dal.vo.TeacherTotalVo
+     */
+    List<TeacherTotalVo> queryTeacherHomeTotal();
 
 }
 

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

@@ -0,0 +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.CourseScheduleReplied;
+
+public interface CourseScheduleRepliedDao extends BaseMapper<CourseScheduleReplied>{
+
+	/**
+	 * 自定义分页
+	 */
+	List<CourseScheduleReplied> selectPage(IPage page, CourseScheduleReplied courseScheduleReplied);
+	
+}

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

@@ -72,7 +72,13 @@ public interface EmployeeDao extends BaseDAO<Long, Employee> {
      * @return: com.yonge.cooleshow.auth.api.entity.SysUser
      */
     SysUser querySysUserByPhone(@Param("phone") String phone);
-
+    /**
+     * 获取用户权限列表
+     *
+     * @param userId
+     * @return
+     */
+    List<Long> queryUserRole(Long userId);
 
     /**
      * @Author: Joburgess
@@ -90,13 +96,7 @@ public interface EmployeeDao extends BaseDAO<Long, Employee> {
     SysUser queryByPhone(String phone);
 
 
-    /**
-     * 获取用户权限列表
-     *
-     * @param userId
-     * @return
-     */
-    List<Long> queryUserRole(Long userId);
+
 
     /**
      * 获取用户信息

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

@@ -1,16 +1,14 @@
 package com.yonge.cooleshow.biz.dal.dao;
 
 import com.yonge.cooleshow.biz.dal.entity.MusicAlbum;
-import com.yonge.cooleshow.common.dal.BaseDAO;
-import org.apache.ibatis.annotations.Mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * MusicAlbumDao数据库访问类
  * @author yzp
- * @date 2022-03-22 16:07:40
+ * @date 2022-03-25 23:46:28
  * @version v1.0
  **/
-@Mapper
-public interface MusicAlbumDao extends BaseDAO<Long, MusicAlbum> {
+public interface MusicAlbumDao extends BaseMapper<MusicAlbum> {
 
 }

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

@@ -1,16 +1,14 @@
 package com.yonge.cooleshow.biz.dal.dao;
 
 import com.yonge.cooleshow.biz.dal.entity.MusicFavorite;
-import com.yonge.cooleshow.common.dal.BaseDAO;
-import org.apache.ibatis.annotations.Mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * MusicFavoriteDao数据库访问类
  * @author yzp
- * @date 2022-03-22 16:07:40
+ * @date 2022-03-25 23:46:28
  * @version v1.0
  **/
-@Mapper
-public interface MusicFavoriteDao extends BaseDAO<Long, MusicFavorite> {
+public interface MusicFavoriteDao extends BaseMapper<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 com.yonge.cooleshow.biz.dal.entity.MusicSheetAccompaniment;
-import com.yonge.cooleshow.common.dal.BaseDAO;
-import org.apache.ibatis.annotations.Mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
 
 /**
  * MusicSheetAccompanimentDao数据库访问类
  * @author yzp
- * @date 2022-03-22 16:07:40
+ * @date 2022-03-25 23:46:28
  * @version v1.0
  **/
-@Mapper
-public interface MusicSheetAccompanimentDao extends BaseDAO<Long, MusicSheetAccompaniment> {
+public interface MusicSheetAccompanimentDao extends BaseMapper<MusicSheetAccompaniment> {
 
 }

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

@@ -1,16 +1,14 @@
 package com.yonge.cooleshow.biz.dal.dao;
 
 import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
-import com.yonge.cooleshow.common.dal.BaseDAO;
-import org.apache.ibatis.annotations.Mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * MusicSheetDao数据库访问类
  * @author yzp
- * @date 2022-03-22 16:07:40
+ * @date 2022-03-25 23:46:28
  * @version v1.0
  **/
-@Mapper
-public interface MusicSheetDao extends BaseDAO<Long, MusicSheet> {
+public interface MusicSheetDao extends BaseMapper<MusicSheet> {
 
 }

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

@@ -1,16 +1,14 @@
 package com.yonge.cooleshow.biz.dal.dao;
 
 import com.yonge.cooleshow.biz.dal.entity.MusicSheetPurchaseRecord;
-import com.yonge.cooleshow.common.dal.BaseDAO;
-import org.apache.ibatis.annotations.Mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * MusicSheetPurchaseRecordDao数据库访问类
  * @author yzp
- * @date 2022-03-22 16:07:40
+ * @date 2022-03-25 23:46:28
  * @version v1.0
  **/
-@Mapper
-public interface MusicSheetPurchaseRecordDao extends BaseDAO<Long, MusicSheetPurchaseRecord> {
+public interface MusicSheetPurchaseRecordDao extends BaseMapper<MusicSheetPurchaseRecord> {
 
 }

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

@@ -5,12 +5,14 @@ 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.StudentStar;
+import com.yonge.cooleshow.biz.dal.vo.TeacherTotalVo;
 
 public interface StudentStarDao extends BaseMapper<StudentStar>{
-
-	/**
-	 * 自定义分页
+	/***
+	 * 查询首页所有老师粉丝数
+	 * @author liweifan
+	 * @updateTime 2022/3/28 10:38
+	 * @return: java.util.List<com.yonge.cooleshow.biz.dal.vo.TeacherTotalVo>
 	 */
-	List<StudentStar> selectPage(IPage page, StudentStar studentStar);
-	
+	List<TeacherTotalVo> queryTeacherHomeTotal();
 }

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

@@ -34,4 +34,12 @@ public interface TeacherAuthEntryRecordDao extends BaseMapper<TeacherAuthEntryRe
 	 * @return: com.yonge.cooleshow.biz.dal.vo.TeacherAuthEntryRecordVo
 	 */
     TeacherAuthEntryRecordVo detail(@Param("id") Long id);
+	/***
+	 * 查询最近一条申请记录
+	 * @author liweifan
+	 * @param: userId
+	 * @updateTime 2022/3/25 16:08
+	 * @return: com.yonge.cooleshow.biz.dal.entity.TeacherAuthEntryRecord
+	 */
+	TeacherAuthEntryRecordVo getLastRecordByUserId(@Param("userId") Long userId);
 }

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

@@ -28,4 +28,5 @@ public interface TeacherAuthMusicianRecordDao extends BaseMapper<TeacherAuthMusi
 	 */
 	List<MusicianAuthEntryRecordVo> selectPage(IPage page, AuthEntryRecordSearch authEntryRecordSearch);
 
+    TeacherAuthMusicianRecord getLastRecordByUserId(@Param("userId") Long userId);
 }

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

@@ -1,16 +1,14 @@
 package com.yonge.cooleshow.biz.dal.dao;
 
 import com.yonge.cooleshow.biz.dal.entity.VideoLessonEvaluate;
-import com.yonge.cooleshow.common.dal.BaseDAO;
-import org.apache.ibatis.annotations.Mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * VideoLessonEvaluateDao数据库访问类
  * @author yzp
- * @date 2022-03-22 16:07:40
+ * @date 2022-03-25 23:46:28
  * @version v1.0
  **/
-@Mapper
-public interface VideoLessonEvaluateDao extends BaseDAO<Long, VideoLessonEvaluate> {
+public interface VideoLessonEvaluateDao extends BaseMapper<VideoLessonEvaluate> {
 
 }

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

@@ -1,16 +1,14 @@
 package com.yonge.cooleshow.biz.dal.dao;
 
 import com.yonge.cooleshow.biz.dal.entity.VideoLessonGroup;
-import com.yonge.cooleshow.common.dal.BaseDAO;
-import org.apache.ibatis.annotations.Mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * VideoLessonGroupDao数据库访问类
  * @author yzp
- * @date 2022-03-22 16:07:40
+ * @date 2022-03-25 23:46:28
  * @version v1.0
  **/
-@Mapper
-public interface VideoLessonGroupDao extends BaseDAO<Long, VideoLessonGroup> {
+public interface VideoLessonGroupDao extends BaseMapper<VideoLessonGroup> {
 
 }

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

@@ -1,16 +1,14 @@
 package com.yonge.cooleshow.biz.dal.dao;
 
 import com.yonge.cooleshow.biz.dal.entity.VideoLessonGroupDetail;
-import com.yonge.cooleshow.common.dal.BaseDAO;
-import org.apache.ibatis.annotations.Mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * VideoLessonGroupDetailDao数据库访问类
  * @author yzp
- * @date 2022-03-22 16:07:41
+ * @date 2022-03-25 23:46:28
  * @version v1.0
  **/
-@Mapper
-public interface VideoLessonGroupDetailDao extends BaseDAO<Long, VideoLessonGroupDetail> {
+public interface VideoLessonGroupDetailDao extends BaseMapper<VideoLessonGroupDetail> {
 
 }

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

@@ -1,16 +1,14 @@
 package com.yonge.cooleshow.biz.dal.dao;
 
 import com.yonge.cooleshow.biz.dal.entity.VideoLessonPurchaseRecord;
-import com.yonge.cooleshow.common.dal.BaseDAO;
-import org.apache.ibatis.annotations.Mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * VideoLessonPurchaseRecordDao数据库访问类
  * @author yzp
- * @date 2022-03-22 16:07:41
+ * @date 2022-03-25 23:46:29
  * @version v1.0
  **/
-@Mapper
-public interface VideoLessonPurchaseRecordDao extends BaseDAO<Long, VideoLessonPurchaseRecord> {
+public interface VideoLessonPurchaseRecordDao extends BaseMapper<VideoLessonPurchaseRecord> {
 
 }

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

@@ -1,16 +1,14 @@
 package com.yonge.cooleshow.biz.dal.dao;
 
 import com.yonge.cooleshow.biz.dal.entity.VideoLessonStudyRecord;
-import com.yonge.cooleshow.common.dal.BaseDAO;
-import org.apache.ibatis.annotations.Mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * VideoLessonStudyRecordDao数据库访问类
  * @author yzp
- * @date 2022-03-22 16:07:41
+ * @date 2022-03-25 23:46:29
  * @version v1.0
  **/
-@Mapper
-public interface VideoLessonStudyRecordDao extends BaseDAO<Long, VideoLessonStudyRecord> {
+public interface VideoLessonStudyRecordDao extends BaseMapper<VideoLessonStudyRecord> {
 
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/AlbumFavoriteDto.java

@@ -0,0 +1,40 @@
+package com.yonge.cooleshow.biz.dal.dto;
+
+import com.yonge.cooleshow.biz.dal.entity.AlbumFavorite;
+
+/**
+ * AlbumFavoriteDto
+ * @author yzp
+ * @date   2022-03-25 23:46:28
+ * @version v1.0
+ **/
+public class AlbumFavoriteDto extends AlbumFavorite {
+    private Integer pageNo;
+    private Integer pageSize;
+    private String 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;
+    }
+
+    public String getSearch() {
+        return search;
+    }
+
+    public void setSearch(String search) {
+        this.search = search;
+    }
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/AlbumMusicRelateDto.java

@@ -0,0 +1,40 @@
+package com.yonge.cooleshow.biz.dal.dto;
+
+import com.yonge.cooleshow.biz.dal.entity.AlbumMusicRelate;
+
+/**
+ * AlbumMusicRelateDto
+ * @author yzp
+ * @date   2022-03-25 23:46:28
+ * @version v1.0
+ **/
+public class AlbumMusicRelateDto extends AlbumMusicRelate {
+    private Integer pageNo;
+    private Integer pageSize;
+    private String 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;
+    }
+
+    public String getSearch() {
+        return search;
+    }
+
+    public void setSearch(String search) {
+        this.search = search;
+    }
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/MusicAlbumDto.java

@@ -0,0 +1,40 @@
+package com.yonge.cooleshow.biz.dal.dto;
+
+import com.yonge.cooleshow.biz.dal.entity.MusicAlbum;
+
+/**
+ * MusicAlbumDto
+ * @author yzp
+ * @date   2022-03-25 23:46:28
+ * @version v1.0
+ **/
+public class MusicAlbumDto extends MusicAlbum {
+    private Integer pageNo;
+    private Integer pageSize;
+    private String 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;
+    }
+
+    public String getSearch() {
+        return search;
+    }
+
+    public void setSearch(String search) {
+        this.search = search;
+    }
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/MusicFavoriteDto.java

@@ -0,0 +1,40 @@
+package com.yonge.cooleshow.biz.dal.dto;
+
+import com.yonge.cooleshow.biz.dal.entity.MusicFavorite;
+
+/**
+ * MusicFavoriteDto
+ * @author yzp
+ * @date   2022-03-25 23:46:28
+ * @version v1.0
+ **/
+public class MusicFavoriteDto extends MusicFavorite {
+    private Integer pageNo;
+    private Integer pageSize;
+    private String 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;
+    }
+
+    public String getSearch() {
+        return search;
+    }
+
+    public void setSearch(String search) {
+        this.search = search;
+    }
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/MusicSheetAccompanimentDto.java

@@ -0,0 +1,40 @@
+package com.yonge.cooleshow.biz.dal.dto;
+
+import com.yonge.cooleshow.biz.dal.entity.MusicSheetAccompaniment;
+
+/**
+ * MusicSheetAccompanimentDto
+ * @author yzp
+ * @date   2022-03-25 23:46:28
+ * @version v1.0
+ **/
+public class MusicSheetAccompanimentDto extends MusicSheetAccompaniment {
+    private Integer pageNo;
+    private Integer pageSize;
+    private String 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;
+    }
+
+    public String getSearch() {
+        return search;
+    }
+
+    public void setSearch(String search) {
+        this.search = search;
+    }
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/MusicSheetDto.java

@@ -0,0 +1,59 @@
+package com.yonge.cooleshow.biz.dal.dto;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
+import com.yonge.cooleshow.biz.dal.entity.MusicSheetAccompaniment;
+
+import java.util.List;
+
+/**
+ * MusicSheetDto
+ * @author yzp
+ * @date   2022-03-25 23:46:28
+ * @version v1.0
+ **/
+public class MusicSheetDto extends MusicSheet {
+    @JsonIgnore
+    private Integer pageNo;
+
+    @JsonIgnore
+    private Integer pageSize;
+
+    @JsonIgnore
+    private String search;
+
+    @JsonIgnore
+    private List<MusicSheetAccompaniment> background;
+
+    public Integer getPageNo() {
+        return pageNo;
+    }
+
+    public void setPageNo(Integer pageNo) {
+        this.pageNo = pageNo;
+    }
+
+    public Integer getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
+
+    public String getSearch() {
+        return search;
+    }
+
+    public void setSearch(String search) {
+        this.search = search;
+    }
+
+    public List<MusicSheetAccompaniment> getBackground() {
+        return background;
+    }
+
+    public void setBackground(List<MusicSheetAccompaniment> background) {
+        this.background = background;
+    }
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/MusicSheetPurchaseRecordDto.java

@@ -0,0 +1,40 @@
+package com.yonge.cooleshow.biz.dal.dto;
+
+import com.yonge.cooleshow.biz.dal.entity.MusicSheetPurchaseRecord;
+
+/**
+ * MusicSheetPurchaseRecordDto
+ * @author yzp
+ * @date   2022-03-25 23:46:28
+ * @version v1.0
+ **/
+public class MusicSheetPurchaseRecordDto extends MusicSheetPurchaseRecord {
+    private Integer pageNo;
+    private Integer pageSize;
+    private String 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;
+    }
+
+    public String getSearch() {
+        return search;
+    }
+
+    public void setSearch(String search) {
+        this.search = search;
+    }
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/VideoLessonEvaluateDto.java

@@ -0,0 +1,40 @@
+package com.yonge.cooleshow.biz.dal.dto;
+
+import com.yonge.cooleshow.biz.dal.entity.VideoLessonEvaluate;
+
+/**
+ * VideoLessonEvaluateDto
+ * @author yzp
+ * @date   2022-03-25 23:46:28
+ * @version v1.0
+ **/
+public class VideoLessonEvaluateDto extends VideoLessonEvaluate {
+    private Integer pageNo;
+    private Integer pageSize;
+    private String 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;
+    }
+
+    public String getSearch() {
+        return search;
+    }
+
+    public void setSearch(String search) {
+        this.search = search;
+    }
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/VideoLessonGroupDetailDto.java

@@ -0,0 +1,40 @@
+package com.yonge.cooleshow.biz.dal.dto;
+
+import com.yonge.cooleshow.biz.dal.entity.VideoLessonGroupDetail;
+
+/**
+ * VideoLessonGroupDetailDto
+ * @author yzp
+ * @date   2022-03-25 23:46:28
+ * @version v1.0
+ **/
+public class VideoLessonGroupDetailDto extends VideoLessonGroupDetail {
+    private Integer pageNo;
+    private Integer pageSize;
+    private String 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;
+    }
+
+    public String getSearch() {
+        return search;
+    }
+
+    public void setSearch(String search) {
+        this.search = search;
+    }
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/VideoLessonGroupDto.java

@@ -0,0 +1,40 @@
+package com.yonge.cooleshow.biz.dal.dto;
+
+import com.yonge.cooleshow.biz.dal.entity.VideoLessonGroup;
+
+/**
+ * VideoLessonGroupDto
+ * @author yzp
+ * @date   2022-03-25 23:46:28
+ * @version v1.0
+ **/
+public class VideoLessonGroupDto extends VideoLessonGroup {
+    private Integer pageNo;
+    private Integer pageSize;
+    private String 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;
+    }
+
+    public String getSearch() {
+        return search;
+    }
+
+    public void setSearch(String search) {
+        this.search = search;
+    }
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/VideoLessonPurchaseRecordDto.java

@@ -0,0 +1,40 @@
+package com.yonge.cooleshow.biz.dal.dto;
+
+import com.yonge.cooleshow.biz.dal.entity.VideoLessonPurchaseRecord;
+
+/**
+ * VideoLessonPurchaseRecordDto
+ * @author yzp
+ * @date   2022-03-25 23:46:29
+ * @version v1.0
+ **/
+public class VideoLessonPurchaseRecordDto extends VideoLessonPurchaseRecord {
+    private Integer pageNo;
+    private Integer pageSize;
+    private String 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;
+    }
+
+    public String getSearch() {
+        return search;
+    }
+
+    public void setSearch(String search) {
+        this.search = search;
+    }
+
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/VideoLessonStudyRecordDto.java

@@ -0,0 +1,40 @@
+package com.yonge.cooleshow.biz.dal.dto;
+
+import com.yonge.cooleshow.biz.dal.entity.VideoLessonStudyRecord;
+
+/**
+ * VideoLessonStudyRecordDto
+ * @author yzp
+ * @date   2022-03-25 23:46:29
+ * @version v1.0
+ **/
+public class VideoLessonStudyRecordDto extends VideoLessonStudyRecord {
+    private Integer pageNo;
+    private Integer pageSize;
+    private String 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;
+    }
+
+    public String getSearch() {
+        return search;
+    }
+
+    public void setSearch(String search) {
+        this.search = search;
+    }
+
+}

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

@@ -1,6 +1,7 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -25,8 +26,8 @@ public class AuthEntryRecordSearch {
     @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 authStatus;
+    @ApiModelProperty(value = "审核状态  0、未申请 1、审核中 2、通过 3、不通过")
+    private AuthStatusEnum authStatus;
 
     public String getSearch() {
         return search;
@@ -60,11 +61,11 @@ public class AuthEntryRecordSearch {
         this.endTime = endTime;
     }
 
-    public Integer getAuthStatus() {
+    public AuthStatusEnum getAuthStatus() {
         return authStatus;
     }
 
-    public void setAuthStatus(Integer authStatus) {
+    public void setAuthStatus(AuthStatusEnum authStatus) {
         this.authStatus = authStatus;
     }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/EmployeeSearch.java

@@ -1,6 +1,7 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -20,7 +21,7 @@ public class EmployeeSearch {
     @ApiModelProperty("学员声部 ")
     private String subjectIdList;
     @ApiModelProperty(value = "0-正常，9-锁定")
-    private Integer lockFlag;
+    private YesOrNoEnum lockFlag;
     @ApiModelProperty(value = "创建开始时间")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@@ -54,11 +55,11 @@ public class EmployeeSearch {
         this.subjectIdList = subjectIdList;
     }
 
-    public Integer getLockFlag() {
+    public YesOrNoEnum getLockFlag() {
         return lockFlag;
     }
 
-    public void setLockFlag(Integer lockFlag) {
+    public void setLockFlag(YesOrNoEnum lockFlag) {
         this.lockFlag = lockFlag;
     }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/StudentSearch.java

@@ -1,6 +1,7 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -20,7 +21,7 @@ public class StudentSearch {
     @ApiModelProperty("学员声部 ")
     private String subjectIdList;
     @ApiModelProperty(value = "是否会员 0否 1是")
-    private Boolean isVip;
+    private YesOrNoEnum isVip;
     @ApiModelProperty(value = "注册开始时间")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@@ -54,12 +55,12 @@ public class StudentSearch {
         this.subjectIdList = subjectIdList;
     }
 
-    public Boolean getVip() {
+    public YesOrNoEnum getIsVip() {
         return isVip;
     }
 
-    public void setVip(Boolean vip) {
-        isVip = vip;
+    public void setIsVip(YesOrNoEnum isVip) {
+        this.isVip = isVip;
     }
 
     public Date getStartTime() {

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

@@ -12,7 +12,7 @@ import java.util.Date;
 /**
  * 专辑收藏表
  * @author yzp
- * @date 2022-03-22 17:55:56
+ * @date 2022-03-25 23:46:28
  * @version v1.0
  **/
 @ApiModel(value = "album_favorite-专辑收藏表")
@@ -32,7 +32,7 @@ public class AlbumFavorite extends BaseEntity {
 
     @TableField("favorite_time_")
     @ApiModelProperty(value = "收藏时间")
-    private Date favoriteTime;  //收藏时间
+    private java.util.Date favoriteTime;  //收藏时间
 
     @TableField("favorite_flag_")
     @ApiModelProperty(value = "是否收藏")
@@ -47,6 +47,7 @@ public class AlbumFavorite extends BaseEntity {
 	public Long getId() {
 	    return this.id;
 	}
+
 	public AlbumFavorite setUserId(Long userId) {
 	    this.userId = userId;
 	    return this;
@@ -55,6 +56,7 @@ public class AlbumFavorite extends BaseEntity {
 	public Long getUserId() {
 	    return this.userId;
 	}
+
 	public AlbumFavorite setAlbumId(Long albumId) {
 	    this.albumId = albumId;
 	    return this;
@@ -63,14 +65,16 @@ public class AlbumFavorite extends BaseEntity {
 	public Long getAlbumId() {
 	    return this.albumId;
 	}
-	public AlbumFavorite setFavoriteTime(Date favoriteTime) {
+
+	public AlbumFavorite setFavoriteTime(java.util.Date favoriteTime) {
 	    this.favoriteTime = favoriteTime;
 	    return this;
 	}
 
-	public Date getFavoriteTime() {
+	public java.util.Date getFavoriteTime() {
 	    return this.favoriteTime;
 	}
+
 	public AlbumFavorite setFavoriteFlag(Integer favoriteFlag) {
 	    this.favoriteFlag = favoriteFlag;
 	    return this;
@@ -80,33 +84,6 @@ public class AlbumFavorite extends BaseEntity {
 	    return this.favoriteFlag;
 	}
 
-	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() {

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

@@ -12,7 +12,7 @@ import java.util.Date;
 /**
  * 专辑曲谱关联表
  * @author yzp
- * @date 2022-03-22 17:55:56
+ * @date 2022-03-25 23:46:28
  * @version v1.0
  **/
 @ApiModel(value = "album_music_relate-专辑曲谱关联表")
@@ -36,7 +36,7 @@ public class AlbumMusicRelate extends BaseEntity {
 
     @TableField("create_time_")
     @ApiModelProperty(value = "添加时间")
-    private Date createTime;  //添加时间
+    private java.util.Date createTime;  //添加时间
 
     @TableField("create_by_")
     @ApiModelProperty(value = "添加人")
@@ -51,6 +51,7 @@ public class AlbumMusicRelate extends BaseEntity {
 	public Long getId() {
 	    return this.id;
 	}
+
 	public AlbumMusicRelate setAlbumId(Long albumId) {
 	    this.albumId = albumId;
 	    return this;
@@ -59,6 +60,7 @@ public class AlbumMusicRelate extends BaseEntity {
 	public Long getAlbumId() {
 	    return this.albumId;
 	}
+
 	public AlbumMusicRelate setMusicSheetId(Long musicSheetId) {
 	    this.musicSheetId = musicSheetId;
 	    return this;
@@ -67,6 +69,7 @@ public class AlbumMusicRelate extends BaseEntity {
 	public Long getMusicSheetId() {
 	    return this.musicSheetId;
 	}
+
 	public AlbumMusicRelate setSortNumber(Integer sortNumber) {
 	    this.sortNumber = sortNumber;
 	    return this;
@@ -75,14 +78,16 @@ public class AlbumMusicRelate extends BaseEntity {
 	public Integer getSortNumber() {
 	    return this.sortNumber;
 	}
-	public AlbumMusicRelate setCreateTime(Date createTime) {
+
+	public AlbumMusicRelate setCreateTime(java.util.Date createTime) {
 	    this.createTime = createTime;
 	    return this;
 	}
 
-	public Date getCreateTime() {
+	public java.util.Date getCreateTime() {
 	    return this.createTime;
 	}
+
 	public AlbumMusicRelate setCreateBy(Long createBy) {
 	    this.createBy = createBy;
 	    return this;
@@ -92,33 +97,6 @@ public class AlbumMusicRelate extends BaseEntity {
 	    return this.createBy;
 	}
 
-	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() {

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

@@ -0,0 +1,177 @@
+package com.yonge.cooleshow.biz.dal.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 课程作业表
+ */
+@TableName("course_homework")
+@ApiModel(value = "CourseHomework对象", description = "课程作业表")
+public class CourseHomework implements Serializable {
+	private static final long serialVersionUID = 1L;
+    /** 
+    * 主键; 
+    */
+    @ApiModelProperty("主键; ")
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Long id;
+    /** 
+    * 课程组编号; 
+    */
+    @ApiModelProperty("课程组编号; ")
+	@TableField(value = "course_group_id_")
+    private Long courseGroupId;
+    /** 
+    * 课程组类型PRACTICE、LIVE; 
+    */
+    @ApiModelProperty("课程组类型PRACTICE、LIVE; ")
+	@TableField(value = "course_group_type_")
+    private String courseGroupType;
+    /** 
+    * 课程编号; 
+    */
+    @ApiModelProperty("课程编号; ")
+	@TableField(value = "course_schedule_id_")
+    private Long courseScheduleId;
+    /** 
+    * 作业标题; 
+    */
+    @ApiModelProperty("作业标题; ")
+	@TableField(value = "title_")
+    private String title;
+    /** 
+    * 作业内容 
+    */
+    @ApiModelProperty("作业内容 ")
+	@TableField(value = "content_")
+    private String content;
+    /** 
+    * 作业附件地址（多个用逗号分隔） 
+    */
+    @ApiModelProperty("作业附件地址（多个用逗号分隔） ")
+	@TableField(value = "attachments_")
+    private String attachments;
+    /** 
+    * 预计提交人数 
+    */
+    @ApiModelProperty("预计提交人数 ")
+	@TableField(value = "expect_num_")
+    private Integer expectNum;
+    /** 
+    * 提交人数 
+    */
+    @ApiModelProperty("提交人数 ")
+	@TableField(value = "completed_num_")
+    private Integer completedNum;
+    /** 
+    * 创建时间; 
+    */
+    @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 Long getCourseGroupId() {
+        return courseGroupId;
+    }
+
+    public void setCourseGroupId(Long courseGroupId) {
+        this.courseGroupId = courseGroupId;
+    }
+
+    public String getCourseGroupType() {
+        return courseGroupType;
+    }
+
+    public void setCourseGroupType(String courseGroupType) {
+        this.courseGroupType = courseGroupType;
+    }
+
+    public Long getCourseScheduleId() {
+        return courseScheduleId;
+    }
+
+    public void setCourseScheduleId(Long courseScheduleId) {
+        this.courseScheduleId = courseScheduleId;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public String getAttachments() {
+        return attachments;
+    }
+
+    public void setAttachments(String attachments) {
+        this.attachments = attachments;
+    }
+
+    public Integer getExpectNum() {
+        return expectNum;
+    }
+
+    public void setExpectNum(Integer expectNum) {
+        this.expectNum = expectNum;
+    }
+
+    public Integer getCompletedNum() {
+        return completedNum;
+    }
+
+    public void setCompletedNum(Integer completedNum) {
+        this.completedNum = completedNum;
+    }
+
+    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;
+    }
+}

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

@@ -0,0 +1,163 @@
+package com.yonge.cooleshow.biz.dal.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 课程点评
+ */
+@TableName("course_schedule_replied")
+@ApiModel(value = "CourseScheduleReplied对象", description = "课程点评")
+public class CourseScheduleReplied implements Serializable {
+	private static final long serialVersionUID = 1L;
+    /** 
+    * 主键 
+    */
+    @ApiModelProperty("主键 ")
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Long id;
+    /** 
+    * 学生id 
+    */
+    @ApiModelProperty("学生id ")
+	@TableField(value = "student_id_")
+    private Long studentId;
+    /** 
+    * 课程编号 
+    */
+    @ApiModelProperty("课程编号 ")
+	@TableField(value = "course_schedule_id_")
+    private Long courseScheduleId;
+    /** 
+    * 课程组类型PRACTICE、LIVE; 
+    */
+    @ApiModelProperty("课程组类型PRACTICE、LIVE; ")
+	@TableField(value = "course_group_type_")
+    private String courseGroupType;
+    /** 
+    * 课程组编号; 
+    */
+    @ApiModelProperty("课程组编号; ")
+	@TableField(value = "course_group_id_")
+    private String courseGroupId;
+    /** 
+    * 学员评分 
+    */
+    @ApiModelProperty("学员评分 ")
+	@TableField(value = "score_")
+    private Integer score;
+    /** 
+    * 学员课后评价 
+    */
+    @ApiModelProperty("学员课后评价 ")
+	@TableField(value = "student_replied_")
+    private String studentReplied;
+    /** 
+    * 老师课后评价 
+    */
+    @ApiModelProperty("老师课后评价 ")
+	@TableField(value = "teacher_replied_")
+    private String teacherReplied;
+    /** 
+    * 创建时间 
+    */
+    @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 Long getStudentId() {
+        return studentId;
+    }
+
+    public void setStudentId(Long studentId) {
+        this.studentId = studentId;
+    }
+
+    public Long getCourseScheduleId() {
+        return courseScheduleId;
+    }
+
+    public void setCourseScheduleId(Long courseScheduleId) {
+        this.courseScheduleId = courseScheduleId;
+    }
+
+    public String getCourseGroupType() {
+        return courseGroupType;
+    }
+
+    public void setCourseGroupType(String courseGroupType) {
+        this.courseGroupType = courseGroupType;
+    }
+
+    public String getCourseGroupId() {
+        return courseGroupId;
+    }
+
+    public void setCourseGroupId(String courseGroupId) {
+        this.courseGroupId = courseGroupId;
+    }
+
+    public Integer getScore() {
+        return score;
+    }
+
+    public void setScore(Integer score) {
+        this.score = score;
+    }
+
+    public String getStudentReplied() {
+        return studentReplied;
+    }
+
+    public void setStudentReplied(String studentReplied) {
+        this.studentReplied = studentReplied;
+    }
+
+    public String getTeacherReplied() {
+        return teacherReplied;
+    }
+
+    public void setTeacherReplied(String teacherReplied) {
+        this.teacherReplied = teacherReplied;
+    }
+
+    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;
+    }
+}

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

@@ -12,7 +12,7 @@ import java.util.Date;
 /**
  * 专辑表
  * @author yzp
- * @date 2022-03-22 17:55:56
+ * @date 2022-03-25 23:46:28
  * @version v1.0
  **/
 @ApiModel(value = "music_album-专辑表")
@@ -56,7 +56,7 @@ public class MusicAlbum extends BaseEntity {
 
     @TableField("create_time_")
     @ApiModelProperty(value = "创建时间")
-    private Date createTime;  //创建时间
+    private java.util.Date createTime;  //创建时间
 
     @TableField("create_by_")
     @ApiModelProperty(value = "创建人")
@@ -64,7 +64,7 @@ public class MusicAlbum extends BaseEntity {
 
     @TableField("update_time_")
     @ApiModelProperty(value = "更新时间")
-    private Date updateTime;  //更新时间
+    private java.util.Date updateTime;  //更新时间
 
     @TableField("update_by_")
     @ApiModelProperty(value = "更新人")
@@ -79,6 +79,7 @@ public class MusicAlbum extends BaseEntity {
 	public Long getId() {
 	    return this.id;
 	}
+
 	public MusicAlbum setAlbumName(String albumName) {
 	    this.albumName = albumName;
 	    return this;
@@ -87,6 +88,7 @@ public class MusicAlbum extends BaseEntity {
 	public String getAlbumName() {
 	    return this.albumName;
 	}
+
 	public MusicAlbum setAlbumDesc(String albumDesc) {
 	    this.albumDesc = albumDesc;
 	    return this;
@@ -95,6 +97,7 @@ public class MusicAlbum extends BaseEntity {
 	public String getAlbumDesc() {
 	    return this.albumDesc;
 	}
+
 	public MusicAlbum setAlbumTag(String albumTag) {
 	    this.albumTag = albumTag;
 	    return this;
@@ -103,6 +106,7 @@ public class MusicAlbum extends BaseEntity {
 	public String getAlbumTag() {
 	    return this.albumTag;
 	}
+
 	public MusicAlbum setAlbumCoverUrl(String albumCoverUrl) {
 	    this.albumCoverUrl = albumCoverUrl;
 	    return this;
@@ -111,6 +115,7 @@ public class MusicAlbum extends BaseEntity {
 	public String getAlbumCoverUrl() {
 	    return this.albumCoverUrl;
 	}
+
 	public MusicAlbum setAlbumStatus(Integer albumStatus) {
 	    this.albumStatus = albumStatus;
 	    return this;
@@ -119,6 +124,7 @@ public class MusicAlbum extends BaseEntity {
 	public Integer getAlbumStatus() {
 	    return this.albumStatus;
 	}
+
 	public MusicAlbum setSortNumber(Integer sortNumber) {
 	    this.sortNumber = sortNumber;
 	    return this;
@@ -127,6 +133,7 @@ public class MusicAlbum extends BaseEntity {
 	public Integer getSortNumber() {
 	    return this.sortNumber;
 	}
+
 	public MusicAlbum setHotFlag(Integer hotFlag) {
 	    this.hotFlag = hotFlag;
 	    return this;
@@ -135,6 +142,7 @@ public class MusicAlbum extends BaseEntity {
 	public Integer getHotFlag() {
 	    return this.hotFlag;
 	}
+
 	public MusicAlbum setTopFlag(Integer topFlag) {
 	    this.topFlag = topFlag;
 	    return this;
@@ -143,14 +151,16 @@ public class MusicAlbum extends BaseEntity {
 	public Integer getTopFlag() {
 	    return this.topFlag;
 	}
-	public MusicAlbum setCreateTime(Date createTime) {
+
+	public MusicAlbum setCreateTime(java.util.Date createTime) {
 	    this.createTime = createTime;
 	    return this;
 	}
 
-	public Date getCreateTime() {
+	public java.util.Date getCreateTime() {
 	    return this.createTime;
 	}
+
 	public MusicAlbum setCreateBy(Long createBy) {
 	    this.createBy = createBy;
 	    return this;
@@ -159,14 +169,16 @@ public class MusicAlbum extends BaseEntity {
 	public Long getCreateBy() {
 	    return this.createBy;
 	}
-	public MusicAlbum setUpdateTime(Date updateTime) {
+
+	public MusicAlbum setUpdateTime(java.util.Date updateTime) {
 	    this.updateTime = updateTime;
 	    return this;
 	}
 
-	public Date getUpdateTime() {
+	public java.util.Date getUpdateTime() {
 	    return this.updateTime;
 	}
+
 	public MusicAlbum setUpdateBy(Long updateBy) {
 	    this.updateBy = updateBy;
 	    return this;
@@ -176,33 +188,6 @@ public class MusicAlbum extends BaseEntity {
 	    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() {

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

@@ -12,7 +12,7 @@ import java.util.Date;
 /**
  * 乐谱收藏表
  * @author yzp
- * @date 2022-03-22 17:55:56
+ * @date 2022-03-25 23:46:28
  * @version v1.0
  **/
 @ApiModel(value = "music_favorite-乐谱收藏表")
@@ -32,7 +32,7 @@ public class MusicFavorite extends BaseEntity {
 
     @TableField("favorite_time_")
     @ApiModelProperty(value = "收藏时间")
-    private Date favoriteTime;  //收藏时间
+    private java.util.Date favoriteTime;  //收藏时间
 
     @TableField("favorite_flag_")
     @ApiModelProperty(value = "是否收藏(1:收藏;0:取消收藏)")
@@ -47,6 +47,7 @@ public class MusicFavorite extends BaseEntity {
 	public Long getId() {
 	    return this.id;
 	}
+
 	public MusicFavorite setUserId(Long userId) {
 	    this.userId = userId;
 	    return this;
@@ -55,6 +56,7 @@ public class MusicFavorite extends BaseEntity {
 	public Long getUserId() {
 	    return this.userId;
 	}
+
 	public MusicFavorite setMusicSheetId(Long musicSheetId) {
 	    this.musicSheetId = musicSheetId;
 	    return this;
@@ -63,14 +65,16 @@ public class MusicFavorite extends BaseEntity {
 	public Long getMusicSheetId() {
 	    return this.musicSheetId;
 	}
-	public MusicFavorite setFavoriteTime(Date favoriteTime) {
+
+	public MusicFavorite setFavoriteTime(java.util.Date favoriteTime) {
 	    this.favoriteTime = favoriteTime;
 	    return this;
 	}
 
-	public Date getFavoriteTime() {
+	public java.util.Date getFavoriteTime() {
 	    return this.favoriteTime;
 	}
+
 	public MusicFavorite setFavoriteFlag(Integer favoriteFlag) {
 	    this.favoriteFlag = favoriteFlag;
 	    return this;
@@ -80,33 +84,6 @@ public class MusicFavorite extends BaseEntity {
 	    return this.favoriteFlag;
 	}
 
-	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() {

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

@@ -1,6 +1,5 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.yonge.cooleshow.common.entity.BaseEntity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -9,17 +8,15 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
-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 java.util.List;
 
 /**
  * 曲谱表
  * @author yzp
- * @date 2022-03-22 17:55:56
+ * @date 2022-03-25 23:46:28
  * @version v1.0
  **/
 @ApiModel(value = "music_sheet-曲谱表")
@@ -36,8 +33,8 @@ public class MusicSheet extends BaseEntity {
     private String musicSheetName;  //曲谱名称
 
     @TableField("user_id_")
-    @ApiModelProperty(value = "曲谱来源(老师ID或后台管理用户ID)")
-    private Long userId;  //曲谱来源(老师ID或后台管理用户ID)
+    @ApiModelProperty(value = "曲谱来源(0:平台;非0:老师ID)")
+    private Long userId;  //曲谱来源(0:平台;非0:老师ID)
 
     @NotBlank(message = "作曲人不能为空!")
     @Size(max = 32, message = "作曲人长度不能超过32位!")
@@ -55,6 +52,7 @@ public class MusicSheet extends BaseEntity {
     @ApiModelProperty(value = "曲谱音频文件类型(midi;mp3)")
     private String audioType;  //曲谱音频文件类型(midi;mp3)
 
+    @NotBlank(message = "曲谱标签不能为空!")
     @TableField("music_tag_")
     @ApiModelProperty(value = "曲谱标签(多个标签用逗号分隔)")
     private String musicTag;  //曲谱标签(多个标签用逗号分隔)
@@ -78,7 +76,7 @@ public class MusicSheet extends BaseEntity {
 
     @TableField("audit_status_")
     @ApiModelProperty(value = "审核状态")
-    private Integer auditStatus;  //审核状态
+    private Integer auditStatus;  //审核状态(0:待审核;1:通过;2:未通过)
 
     @TableField("sort_number_")
     @ApiModelProperty(value = "排序号")
@@ -112,7 +110,7 @@ public class MusicSheet extends BaseEntity {
 
     @TableField("create_time_")
     @ApiModelProperty(value = "创建时间")
-    private Date createTime;  //创建时间
+    private java.util.Date createTime;  //创建时间
 
     @TableField("create_by_")
     @ApiModelProperty(value = "创建人(老师或者是后台平台用户)")
@@ -120,7 +118,7 @@ public class MusicSheet extends BaseEntity {
 
     @TableField("update_time_")
     @ApiModelProperty(value = "更新时间")
-    private Date updateTime;  //更新时间
+    private java.util.Date updateTime;  //更新时间
 
     @TableField("update_by_")
     @ApiModelProperty(value = "更新人(老师或者是后台平台用户)")
@@ -128,8 +126,7 @@ public class MusicSheet extends BaseEntity {
 
     @TableField("remark_")
     @ApiModelProperty(value = "备注")
-    @JsonIgnore
-    private String remark;  //备注
+    private String remark;  //备注，填写未通过审核的原因
 
 
 	public MusicSheet setId(Long id) {
@@ -140,6 +137,7 @@ public class MusicSheet extends BaseEntity {
 	public Long getId() {
 	    return this.id;
 	}
+
 	public MusicSheet setMusicSheetName(String musicSheetName) {
 	    this.musicSheetName = musicSheetName;
 	    return this;
@@ -148,6 +146,7 @@ public class MusicSheet extends BaseEntity {
 	public String getMusicSheetName() {
 	    return this.musicSheetName;
 	}
+
 	public MusicSheet setUserId(Long userId) {
 	    this.userId = userId;
 	    return this;
@@ -156,6 +155,7 @@ public class MusicSheet extends BaseEntity {
 	public Long getUserId() {
 	    return this.userId;
 	}
+
 	public MusicSheet setComposer(String composer) {
 	    this.composer = composer;
 	    return this;
@@ -164,6 +164,7 @@ public class MusicSheet extends BaseEntity {
 	public String getComposer() {
 	    return this.composer;
 	}
+
 	public MusicSheet setMusicSubject(String musicSubject) {
 	    this.musicSubject = musicSubject;
 	    return this;
@@ -172,6 +173,7 @@ public class MusicSheet extends BaseEntity {
 	public String getMusicSubject() {
 	    return this.musicSubject;
 	}
+
 	public MusicSheet setAudioType(String audioType) {
 	    this.audioType = audioType;
 	    return this;
@@ -180,6 +182,7 @@ public class MusicSheet extends BaseEntity {
 	public String getAudioType() {
 	    return this.audioType;
 	}
+
 	public MusicSheet setMusicTag(String musicTag) {
 	    this.musicTag = musicTag;
 	    return this;
@@ -188,6 +191,7 @@ public class MusicSheet extends BaseEntity {
 	public String getMusicTag() {
 	    return this.musicTag;
 	}
+
 	public MusicSheet setPlaySpeed(Integer playSpeed) {
 	    this.playSpeed = playSpeed;
 	    return this;
@@ -196,6 +200,7 @@ public class MusicSheet extends BaseEntity {
 	public Integer getPlaySpeed() {
 	    return this.playSpeed;
 	}
+
 	public MusicSheet setCanEvaluate(Integer canEvaluate) {
 	    this.canEvaluate = canEvaluate;
 	    return this;
@@ -204,6 +209,7 @@ public class MusicSheet extends BaseEntity {
 	public Integer getCanEvaluate() {
 	    return this.canEvaluate;
 	}
+
 	public MusicSheet setShowFingering(Integer showFingering) {
 	    this.showFingering = showFingering;
 	    return this;
@@ -212,6 +218,7 @@ public class MusicSheet extends BaseEntity {
 	public Integer getShowFingering() {
 	    return this.showFingering;
 	}
+
 	public MusicSheet setChargeType(Integer chargeType) {
 	    this.chargeType = chargeType;
 	    return this;
@@ -220,6 +227,7 @@ public class MusicSheet extends BaseEntity {
 	public Integer getChargeType() {
 	    return this.chargeType;
 	}
+
 	public MusicSheet setAuditStatus(Integer auditStatus) {
 	    this.auditStatus = auditStatus;
 	    return this;
@@ -228,6 +236,7 @@ public class MusicSheet extends BaseEntity {
 	public Integer getAuditStatus() {
 	    return this.auditStatus;
 	}
+
 	public MusicSheet setSortNumber(Integer sortNumber) {
 	    this.sortNumber = sortNumber;
 	    return this;
@@ -236,6 +245,7 @@ public class MusicSheet extends BaseEntity {
 	public Integer getSortNumber() {
 	    return this.sortNumber;
 	}
+
 	public MusicSheet setTopFlag(Integer topFlag) {
 	    this.topFlag = topFlag;
 	    return this;
@@ -244,6 +254,7 @@ public class MusicSheet extends BaseEntity {
 	public Integer getTopFlag() {
 	    return this.topFlag;
 	}
+
 	public MusicSheet setHotFlag(Integer hotFlag) {
 	    this.hotFlag = hotFlag;
 	    return this;
@@ -252,6 +263,7 @@ public class MusicSheet extends BaseEntity {
 	public Integer getHotFlag() {
 	    return this.hotFlag;
 	}
+
 	public MusicSheet setMusicPrice(java.math.BigDecimal musicPrice) {
 	    this.musicPrice = musicPrice;
 	    return this;
@@ -260,6 +272,7 @@ public class MusicSheet extends BaseEntity {
 	public java.math.BigDecimal getMusicPrice() {
 	    return this.musicPrice;
 	}
+
 	public MusicSheet setAudioFileUrl(String audioFileUrl) {
 	    this.audioFileUrl = audioFileUrl;
 	    return this;
@@ -268,6 +281,7 @@ public class MusicSheet extends BaseEntity {
 	public String getAudioFileUrl() {
 	    return this.audioFileUrl;
 	}
+
 	public MusicSheet setXmlFileUrl(String xmlFileUrl) {
 	    this.xmlFileUrl = xmlFileUrl;
 	    return this;
@@ -276,6 +290,7 @@ public class MusicSheet extends BaseEntity {
 	public String getXmlFileUrl() {
 	    return this.xmlFileUrl;
 	}
+
 	public MusicSheet setHasBeat(Integer hasBeat) {
 	    this.hasBeat = hasBeat;
 	    return this;
@@ -284,14 +299,16 @@ public class MusicSheet extends BaseEntity {
 	public Integer getHasBeat() {
 	    return this.hasBeat;
 	}
-	public MusicSheet setCreateTime(Date createTime) {
+
+	public MusicSheet setCreateTime(java.util.Date createTime) {
 	    this.createTime = createTime;
 	    return this;
 	}
 
-	public Date getCreateTime() {
+	public java.util.Date getCreateTime() {
 	    return this.createTime;
 	}
+
 	public MusicSheet setCreateBy(Long createBy) {
 	    this.createBy = createBy;
 	    return this;
@@ -300,14 +317,16 @@ public class MusicSheet extends BaseEntity {
 	public Long getCreateBy() {
 	    return this.createBy;
 	}
-	public MusicSheet setUpdateTime(Date updateTime) {
+
+	public MusicSheet setUpdateTime(java.util.Date updateTime) {
 	    this.updateTime = updateTime;
 	    return this;
 	}
 
-	public Date getUpdateTime() {
+	public java.util.Date getUpdateTime() {
 	    return this.updateTime;
 	}
+
 	public MusicSheet setUpdateBy(Long updateBy) {
 	    this.updateBy = updateBy;
 	    return this;
@@ -316,6 +335,7 @@ public class MusicSheet extends BaseEntity {
 	public Long getUpdateBy() {
 	    return this.updateBy;
 	}
+
 	public MusicSheet setRemark(String remark) {
 	    this.remark = remark;
 	    return this;
@@ -325,49 +345,6 @@ public class MusicSheet extends BaseEntity {
 	    return this.remark;
 	}
 
-    @JsonIgnore
-	public int pageNo;
-
-    @JsonIgnore
-    public int pageSize;
-
-    @JsonIgnore
-    public String search;
-
-    public List<MusicSheetAccompaniment> getBackground() {
-        return background;
-    }
-
-    public void setBackground(List<MusicSheetAccompaniment> background) {
-        this.background = background;
-    }
-
-    @ApiModelProperty(value = "mp3关联的主音或者伴奏文件")
-    public List<MusicSheetAccompaniment> background; //mp3关联的主音或者伴奏文件
-
-    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() {

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

@@ -12,7 +12,7 @@ import java.util.Date;
 /**
  * 曲谱伴奏表
  * @author yzp
- * @date 2022-03-22 17:55:56
+ * @date 2022-03-25 23:46:28
  * @version v1.0
  **/
 @ApiModel(value = "music_sheet_accompaniment-曲谱伴奏表")
@@ -40,7 +40,7 @@ public class MusicSheetAccompaniment extends BaseEntity {
 
     @TableField("create_time_")
     @ApiModelProperty(value = "创建时间")
-    private Date createTime;  //创建时间
+    private java.util.Date createTime;  //创建时间
 
     @TableField("create_by_")
     @ApiModelProperty(value = "创建人(老师或者是后台平台用户)")
@@ -55,6 +55,7 @@ public class MusicSheetAccompaniment extends BaseEntity {
 	public Long getId() {
 	    return this.id;
 	}
+
 	public MusicSheetAccompaniment setMusicSheetId(Long musicSheetId) {
 	    this.musicSheetId = musicSheetId;
 	    return this;
@@ -63,6 +64,7 @@ public class MusicSheetAccompaniment extends BaseEntity {
 	public Long getMusicSheetId() {
 	    return this.musicSheetId;
 	}
+
 	public MusicSheetAccompaniment setMusicSubject(String musicSubject) {
 	    this.musicSubject = musicSubject;
 	    return this;
@@ -71,6 +73,7 @@ public class MusicSheetAccompaniment extends BaseEntity {
 	public String getMusicSubject() {
 	    return this.musicSubject;
 	}
+
 	public MusicSheetAccompaniment setAudioFileUrl(String audioFileUrl) {
 	    this.audioFileUrl = audioFileUrl;
 	    return this;
@@ -79,6 +82,7 @@ public class MusicSheetAccompaniment extends BaseEntity {
 	public String getAudioFileUrl() {
 	    return this.audioFileUrl;
 	}
+
 	public MusicSheetAccompaniment setSortNumber(Integer sortNumber) {
 	    this.sortNumber = sortNumber;
 	    return this;
@@ -87,14 +91,16 @@ public class MusicSheetAccompaniment extends BaseEntity {
 	public Integer getSortNumber() {
 	    return this.sortNumber;
 	}
-	public MusicSheetAccompaniment setCreateTime(Date createTime) {
+
+	public MusicSheetAccompaniment setCreateTime(java.util.Date createTime) {
 	    this.createTime = createTime;
 	    return this;
 	}
 
-	public Date getCreateTime() {
+	public java.util.Date getCreateTime() {
 	    return this.createTime;
 	}
+
 	public MusicSheetAccompaniment setCreateBy(Long createBy) {
 	    this.createBy = createBy;
 	    return this;
@@ -104,33 +110,6 @@ public class MusicSheetAccompaniment extends BaseEntity {
 	    return this.createBy;
 	}
 
-	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() {

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

@@ -12,7 +12,7 @@ import java.util.Date;
 /**
  * 曲谱购买记录表
  * @author yzp
- * @date 2022-03-22 17:55:57
+ * @date 2022-03-25 23:46:28
  * @version v1.0
  **/
 @ApiModel(value = "music_sheet_purchase_record-曲谱购买记录表")
@@ -40,7 +40,7 @@ public class MusicSheetPurchaseRecord extends BaseEntity {
 
     @TableField("purchase_time_")
     @ApiModelProperty(value = "购买时间")
-    private Date purchaseTime;  //购买时间
+    private java.util.Date purchaseTime;  //购买时间
 
     @TableField("purchase_price_")
     @ApiModelProperty(value = "购买价格")
@@ -59,6 +59,7 @@ public class MusicSheetPurchaseRecord extends BaseEntity {
 	public Long getId() {
 	    return this.id;
 	}
+
 	public MusicSheetPurchaseRecord setMusicSheetId(Long musicSheetId) {
 	    this.musicSheetId = musicSheetId;
 	    return this;
@@ -67,6 +68,7 @@ public class MusicSheetPurchaseRecord extends BaseEntity {
 	public Long getMusicSheetId() {
 	    return this.musicSheetId;
 	}
+
 	public MusicSheetPurchaseRecord setTeacherId(Long teacherId) {
 	    this.teacherId = teacherId;
 	    return this;
@@ -75,6 +77,7 @@ public class MusicSheetPurchaseRecord extends BaseEntity {
 	public Long getTeacherId() {
 	    return this.teacherId;
 	}
+
 	public MusicSheetPurchaseRecord setOrderNo(String orderNo) {
 	    this.orderNo = orderNo;
 	    return this;
@@ -83,6 +86,7 @@ public class MusicSheetPurchaseRecord extends BaseEntity {
 	public String getOrderNo() {
 	    return this.orderNo;
 	}
+
 	public MusicSheetPurchaseRecord setStudentId(Long studentId) {
 	    this.studentId = studentId;
 	    return this;
@@ -91,14 +95,16 @@ public class MusicSheetPurchaseRecord extends BaseEntity {
 	public Long getStudentId() {
 	    return this.studentId;
 	}
-	public MusicSheetPurchaseRecord setPurchaseTime(Date purchaseTime) {
+
+	public MusicSheetPurchaseRecord setPurchaseTime(java.util.Date purchaseTime) {
 	    this.purchaseTime = purchaseTime;
 	    return this;
 	}
 
-	public Date getPurchaseTime() {
+	public java.util.Date getPurchaseTime() {
 	    return this.purchaseTime;
 	}
+
 	public MusicSheetPurchaseRecord setPurchasePrice(java.math.BigDecimal purchasePrice) {
 	    this.purchasePrice = purchasePrice;
 	    return this;
@@ -107,6 +113,7 @@ public class MusicSheetPurchaseRecord extends BaseEntity {
 	public java.math.BigDecimal getPurchasePrice() {
 	    return this.purchasePrice;
 	}
+
 	public MusicSheetPurchaseRecord setOrderStatus(Integer orderStatus) {
 	    this.orderStatus = orderStatus;
 	    return this;
@@ -116,33 +123,6 @@ public class MusicSheetPurchaseRecord extends BaseEntity {
 	    return this.orderStatus;
 	}
 
-	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() {

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

@@ -20,7 +20,7 @@ public class SysConfig extends BaseEntity {
 	
 	/** 参数值 */
 	@ApiModelProperty(value = "参数值", required = true)
-	private String paranValue;
+	private String paramValue;
 	
 	/** 描述 */
 	@ApiModelProperty(value = "描述", required = true)
@@ -51,19 +51,19 @@ public class SysConfig extends BaseEntity {
 		return this.paramName;
 	}
 			
-	public void setParanValue(String paranValue){
-		this.paranValue = paranValue;
+	public void setParamValue(String paramValue){
+		this.paramValue = paramValue;
 	}
 	
-	public String getParanValue(){
-		return this.paranValue;
+	public String getParamValue(){
+		return this.paramValue;
 	}
 
-	public <T> T getParanValue(Class<T> cla){
+	public <T> T getParamValue(Class<T> cla){
 		try {
-			return cla.cast(cla.getMethod("valueOf", String.class).invoke(cla.getInterfaces(),this.paranValue));
+			return cla.cast(cla.getMethod("valueOf", String.class).invoke(cla.getInterfaces(),this.paramValue));
 		} catch (Exception e) {
-			return (T)this.paranValue.getClass();
+			return (T)this.paramValue.getClass();
 		}
 	}
 			

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

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.yonge.cooleshow.biz.dal.enums.TeacherTypeEnum;
+import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -62,19 +64,42 @@ public class Teacher implements Serializable {
 	@TableField(value = "subject_id_")
     private String subjectId;
     /**
-     * 老师类型 tourist 游客 entry 认证老师 musician 音乐人
+     * 个人介绍
      */
-    @ApiModelProperty("老师类型 tourist 游客 entry 认证老师 musician 音乐人 ")
-    @TableField(value = "teacher_type_")
-    private String teacherType;
-
-    /** 
-    * 老师入驻状态  1、审核中 2、通过 3、不通过 
-    */
-    @ApiModelProperty("老师入驻状态  1、审核中 2、通过 3、不通过 ")
-	@TableField(value = "entry_status_")
-    private Integer entryStatus;
-    /** 
+    @ApiModelProperty("个人介绍 ")
+    @TableField(value = "introduction_")
+    private String introduction;
+    /**
+     * 学校专业
+     */
+    @ApiModelProperty("学校专业 ")
+    @TableField(value = "subject_")
+    private String subject;
+    /**
+     * 毕业证书
+     */
+    @ApiModelProperty("毕业证书 ")
+    @TableField(value = "grad_certificate_")
+    private String gradCertificate;
+    /**
+     * 学位证书
+     */
+    @ApiModelProperty("学位证书 ")
+    @TableField(value = "degree__certificate_")
+    private String degreeCertificate;
+    /**
+     * 教师资格证
+     */
+    @ApiModelProperty("教师资格证 ")
+    @TableField(value = "teacher__certificate_")
+    private String teacherCertificate;
+    /**
+     * 老师入驻  0 否 1 是
+     */
+    @ApiModelProperty("老师入驻  0 否 1 是 ")
+    @TableField(value = "entry_flag_")
+    private YesOrNoEnum entryFlag;
+    /**
     * 入驻时间 
     */
     @ApiModelProperty("入驻时间 ")
@@ -82,58 +107,28 @@ public class Teacher implements Serializable {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date entryAuthDate;
+
     /** 
-    * 个人介绍 
-    */
-    @ApiModelProperty("个人介绍 ")
-	@TableField(value = "introduction_")
-    private String introduction;
-    /** 
-    * 音乐人审核状态   1、审核中 2、通过 3、不通过 
+    * 音乐人  0 否 1 是
     */
-    @ApiModelProperty("音乐人审核状态   1、审核中 2、通过 3、不通过 ")
-	@TableField(value = "musician_auth_status_")
-    private Integer musicianAuthStatus;
+    @ApiModelProperty("音乐人  0 否 1 是 ")
+	@TableField(value = "musician_flag_")
+    private YesOrNoEnum musicianFlag;
     /**
-     * 直播权限 0 否 1 是
+     * 音乐人认证时间
      */
-    @ApiModelProperty("直播权限 0 否 1 是")
-    @TableField(value = "live_flag_")
-    private Integer liveFlag;
-
-    /** 
-    * 音乐人认证时间 
-    */
     @ApiModelProperty("音乐人认证时间 ")
-	@TableField(value = "musician_date_")
+    @TableField(value = "musician_date_")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date musicianDate;
-    /** 
-    * 学校专业 
-    */
-    @ApiModelProperty("学校专业 ")
-	@TableField(value = "subject_")
-    private String subject;
-    /** 
-    * 毕业证书 
-    */
-    @ApiModelProperty("毕业证书 ")
-	@TableField(value = "grad_certificate_")
-    private String gradCertificate;
-    /** 
-    * 学位证书 
-    */
-    @ApiModelProperty("学位证书 ")
-	@TableField(value = "degree__certificate_")
-    private String degreeCertificate;
-    /** 
-    * 教师资格证 
-    */
-    @ApiModelProperty("教师资格证 ")
-	@TableField(value = "teacher__certificate_")
-    private String teacherCertificate;
-    /** 
+    /**
+     * 直播权限 0 否 1 是
+     */
+    @ApiModelProperty("直播权限 0 否 1 是")
+    @TableField(value = "live_flag_")
+    private YesOrNoEnum liveFlag;
+    /**
     * 备注 
     */
     @ApiModelProperty("备注 ")
@@ -196,22 +191,6 @@ public class Teacher implements Serializable {
         this.subjectId = subjectId;
     }
 
-    public Integer getEntryStatus() {
-        return entryStatus;
-    }
-
-    public void setEntryStatus(Integer entryStatus) {
-        this.entryStatus = entryStatus;
-    }
-
-    public Date getEntryAuthDate() {
-        return entryAuthDate;
-    }
-
-    public void setEntryAuthDate(Date entryAuthDate) {
-        this.entryAuthDate = entryAuthDate;
-    }
-
     public String getIntroduction() {
         return introduction;
     }
@@ -220,22 +199,6 @@ public class Teacher implements Serializable {
         this.introduction = introduction;
     }
 
-    public Integer getMusicianAuthStatus() {
-        return musicianAuthStatus;
-    }
-
-    public void setMusicianAuthStatus(Integer musicianAuthStatus) {
-        this.musicianAuthStatus = musicianAuthStatus;
-    }
-
-    public Date getMusicianDate() {
-        return musicianDate;
-    }
-
-    public void setMusicianDate(Date musicianDate) {
-        this.musicianDate = musicianDate;
-    }
-
     public String getSubject() {
         return subject;
     }
@@ -268,6 +231,46 @@ public class Teacher implements Serializable {
         this.teacherCertificate = teacherCertificate;
     }
 
+    public YesOrNoEnum getEntryFlag() {
+        return entryFlag;
+    }
+
+    public void setEntryFlag(YesOrNoEnum entryFlag) {
+        this.entryFlag = entryFlag;
+    }
+
+    public Date getEntryAuthDate() {
+        return entryAuthDate;
+    }
+
+    public void setEntryAuthDate(Date entryAuthDate) {
+        this.entryAuthDate = entryAuthDate;
+    }
+
+    public YesOrNoEnum getMusicianFlag() {
+        return musicianFlag;
+    }
+
+    public void setMusicianFlag(YesOrNoEnum musicianFlag) {
+        this.musicianFlag = musicianFlag;
+    }
+
+    public Date getMusicianDate() {
+        return musicianDate;
+    }
+
+    public void setMusicianDate(Date musicianDate) {
+        this.musicianDate = musicianDate;
+    }
+
+    public YesOrNoEnum getLiveFlag() {
+        return liveFlag;
+    }
+
+    public void setLiveFlag(YesOrNoEnum liveFlag) {
+        this.liveFlag = liveFlag;
+    }
+
     public String getMemo() {
         return memo;
     }
@@ -291,20 +294,4 @@ 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;
-    }
-
-    public String getTeacherType() {
-        return teacherType;
-    }
-
-    public void setTeacherType(String teacherType) {
-        this.teacherType = teacherType;
-    }
 }

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -77,12 +78,10 @@ public class TeacherAuthEntryRecord implements Serializable {
     @ApiModelProperty("教师资格证 ")
 	@TableField(value = "teacher__certificate_")
     private String teacherCertificate;
-    /** 
-    * 老师认证审核状态  1、审核中 2、通过 3、不通过 
-    */
-    @ApiModelProperty("老师认证审核状态  1、审核中 2、通过 3、不通过 ")
+
+    @ApiModelProperty("老师认证审核状态 1、审核中 2、通过 3、不通过 ")
 	@TableField(value = "teacher_auth_status_")
-    private Integer teacherAuthStatus;
+    private AuthStatusEnum teacherAuthStatus;
     /** 
     * 审核人 
     */
@@ -178,11 +177,11 @@ public class TeacherAuthEntryRecord implements Serializable {
         this.teacherCertificate = teacherCertificate;
     }
 
-    public Integer getTeacherAuthStatus() {
+    public AuthStatusEnum getTeacherAuthStatus() {
         return teacherAuthStatus;
     }
 
-    public void setTeacherAuthStatus(Integer teacherAuthStatus) {
+    public void setTeacherAuthStatus(AuthStatusEnum teacherAuthStatus) {
         this.teacherAuthStatus = teacherAuthStatus;
     }
 

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -31,12 +32,10 @@ public class TeacherAuthMusicianRecord implements Serializable {
     @ApiModelProperty("对应user表用户编号 ")
 	@TableField(value = "user_id_")
     private Long userId;
-    /** 
-    * 老师认证审核状态  1、审核中 2、通过 3、不通过 
-    */
-    @ApiModelProperty("老师认证审核状态  1、审核中 2、通过 3、不通过 ")
+
+    @ApiModelProperty("老师认证审核状态 1、审核中 2、通过 3、不通过 ")
 	@TableField(value = "teacher_auth_status_")
-    private Integer teacherAuthStatus;
+    private AuthStatusEnum teacherAuthStatus;
     /** 
     * 审核人 
     */
@@ -74,11 +73,11 @@ public class TeacherAuthMusicianRecord implements Serializable {
         this.userId = userId;
     }
 
-    public Integer getTeacherAuthStatus() {
+    public AuthStatusEnum getTeacherAuthStatus() {
         return teacherAuthStatus;
     }
 
-    public void setTeacherAuthStatus(Integer teacherAuthStatus) {
+    public void setTeacherAuthStatus(AuthStatusEnum teacherAuthStatus) {
         this.teacherAuthStatus = teacherAuthStatus;
     }
 

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

@@ -12,7 +12,7 @@ import java.util.Date;
 /**
  * 视频课学员评价
  * @author yzp
- * @date 2022-03-22 17:55:57
+ * @date 2022-03-25 23:46:28
  * @version v1.0
  **/
 @ApiModel(value = "video_lesson_evaluate-视频课学员评价")
@@ -36,7 +36,7 @@ public class VideoLessonEvaluate extends BaseEntity {
 
     @TableField("evaluate_time_")
     @ApiModelProperty(value = "评价时间")
-    private Date evaluateTime;  //评价时间
+    private java.util.Date evaluateTime;  //评价时间
 
 
 	public VideoLessonEvaluate setId(Long id) {
@@ -47,6 +47,7 @@ public class VideoLessonEvaluate extends BaseEntity {
 	public Long getId() {
 	    return this.id;
 	}
+
 	public VideoLessonEvaluate setVideoId(Long videoId) {
 	    this.videoId = videoId;
 	    return this;
@@ -55,6 +56,7 @@ public class VideoLessonEvaluate extends BaseEntity {
 	public Long getVideoId() {
 	    return this.videoId;
 	}
+
 	public VideoLessonEvaluate setStudentId(Long studentId) {
 	    this.studentId = studentId;
 	    return this;
@@ -63,6 +65,7 @@ public class VideoLessonEvaluate extends BaseEntity {
 	public Long getStudentId() {
 	    return this.studentId;
 	}
+
 	public VideoLessonEvaluate setContent(String content) {
 	    this.content = content;
 	    return this;
@@ -71,42 +74,16 @@ public class VideoLessonEvaluate extends BaseEntity {
 	public String getContent() {
 	    return this.content;
 	}
-	public VideoLessonEvaluate setEvaluateTime(Date evaluateTime) {
+
+	public VideoLessonEvaluate setEvaluateTime(java.util.Date evaluateTime) {
 	    this.evaluateTime = evaluateTime;
 	    return this;
 	}
 
-	public Date getEvaluateTime() {
+	public java.util.Date getEvaluateTime() {
 	    return this.evaluateTime;
 	}
 
-	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() {

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

@@ -12,7 +12,7 @@ import java.util.Date;
 /**
  * 视频课基本信息表
  * @author yzp
- * @date 2022-03-22 17:55:57
+ * @date 2022-03-25 23:46:28
  * @version v1.0
  **/
 @ApiModel(value = "video_lesson_group-视频课基本信息表")
@@ -72,11 +72,11 @@ public class VideoLessonGroup extends BaseEntity {
 
     @TableField("create_time_")
     @ApiModelProperty(value = "创建时间")
-    private Date createTime;  //创建时间
+    private java.util.Date createTime;  //创建时间
 
     @TableField("update_time_")
     @ApiModelProperty(value = "更新时间")
-    private Date updateTime;  //更新时间
+    private java.util.Date updateTime;  //更新时间
 
 
 	public VideoLessonGroup setId(Long id) {
@@ -87,6 +87,7 @@ public class VideoLessonGroup extends BaseEntity {
 	public Long getId() {
 	    return this.id;
 	}
+
 	public VideoLessonGroup setLessonName(String lessonName) {
 	    this.lessonName = lessonName;
 	    return this;
@@ -95,6 +96,7 @@ public class VideoLessonGroup extends BaseEntity {
 	public String getLessonName() {
 	    return this.lessonName;
 	}
+
 	public VideoLessonGroup setLessonSubject(String lessonSubject) {
 	    this.lessonSubject = lessonSubject;
 	    return this;
@@ -103,6 +105,7 @@ public class VideoLessonGroup extends BaseEntity {
 	public String getLessonSubject() {
 	    return this.lessonSubject;
 	}
+
 	public VideoLessonGroup setLessonDesc(String lessonDesc) {
 	    this.lessonDesc = lessonDesc;
 	    return this;
@@ -111,6 +114,7 @@ public class VideoLessonGroup extends BaseEntity {
 	public String getLessonDesc() {
 	    return this.lessonDesc;
 	}
+
 	public VideoLessonGroup setLessonPrice(Integer lessonPrice) {
 	    this.lessonPrice = lessonPrice;
 	    return this;
@@ -119,6 +123,7 @@ public class VideoLessonGroup extends BaseEntity {
 	public Integer getLessonPrice() {
 	    return this.lessonPrice;
 	}
+
 	public VideoLessonGroup setLessonCoverUrl(String lessonCoverUrl) {
 	    this.lessonCoverUrl = lessonCoverUrl;
 	    return this;
@@ -127,6 +132,7 @@ public class VideoLessonGroup extends BaseEntity {
 	public String getLessonCoverUrl() {
 	    return this.lessonCoverUrl;
 	}
+
 	public VideoLessonGroup setTeacherId(Long teacherId) {
 	    this.teacherId = teacherId;
 	    return this;
@@ -135,6 +141,7 @@ public class VideoLessonGroup extends BaseEntity {
 	public Long getTeacherId() {
 	    return this.teacherId;
 	}
+
 	public VideoLessonGroup setLessonCount(Integer lessonCount) {
 	    this.lessonCount = lessonCount;
 	    return this;
@@ -143,6 +150,7 @@ public class VideoLessonGroup extends BaseEntity {
 	public Integer getLessonCount() {
 	    return this.lessonCount;
 	}
+
 	public VideoLessonGroup setSortNumber(Integer sortNumber) {
 	    this.sortNumber = sortNumber;
 	    return this;
@@ -151,6 +159,7 @@ public class VideoLessonGroup extends BaseEntity {
 	public Integer getSortNumber() {
 	    return this.sortNumber;
 	}
+
 	public VideoLessonGroup setLessonTag(String lessonTag) {
 	    this.lessonTag = lessonTag;
 	    return this;
@@ -159,6 +168,7 @@ public class VideoLessonGroup extends BaseEntity {
 	public String getLessonTag() {
 	    return this.lessonTag;
 	}
+
 	public VideoLessonGroup setTopFlag(Integer topFlag) {
 	    this.topFlag = topFlag;
 	    return this;
@@ -167,6 +177,7 @@ public class VideoLessonGroup extends BaseEntity {
 	public Integer getTopFlag() {
 	    return this.topFlag;
 	}
+
 	public VideoLessonGroup setHotFlag(Integer hotFlag) {
 	    this.hotFlag = hotFlag;
 	    return this;
@@ -175,6 +186,7 @@ public class VideoLessonGroup extends BaseEntity {
 	public Integer getHotFlag() {
 	    return this.hotFlag;
 	}
+
 	public VideoLessonGroup setAuditStatus(Integer auditStatus) {
 	    this.auditStatus = auditStatus;
 	    return this;
@@ -183,50 +195,25 @@ public class VideoLessonGroup extends BaseEntity {
 	public Integer getAuditStatus() {
 	    return this.auditStatus;
 	}
-	public VideoLessonGroup setCreateTime(Date createTime) {
+
+	public VideoLessonGroup setCreateTime(java.util.Date createTime) {
 	    this.createTime = createTime;
 	    return this;
 	}
 
-	public Date getCreateTime() {
+	public java.util.Date getCreateTime() {
 	    return this.createTime;
 	}
-	public VideoLessonGroup setUpdateTime(Date updateTime) {
+
+	public VideoLessonGroup setUpdateTime(java.util.Date updateTime) {
 	    this.updateTime = updateTime;
 	    return this;
 	}
 
-	public Date getUpdateTime() {
+	public java.util.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() {

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

@@ -12,7 +12,7 @@ import java.util.Date;
 /**
  * 视频课明细表
  * @author yzp
- * @date 2022-03-22 17:55:57
+ * @date 2022-03-25 23:46:28
  * @version v1.0
  **/
 @ApiModel(value = "video_lesson_group_detail-视频课明细表")
@@ -56,7 +56,7 @@ public class VideoLessonGroupDetail extends BaseEntity {
 
     @TableField("create_time_")
     @ApiModelProperty(value = "创建时间")
-    private Date createTime;  //创建时间
+    private java.util.Date createTime;  //创建时间
 
     @TableField("update_by_")
     @ApiModelProperty(value = "更新人")
@@ -64,7 +64,7 @@ public class VideoLessonGroupDetail extends BaseEntity {
 
     @TableField("update_time_")
     @ApiModelProperty(value = "更新时间")
-    private Date updateTime;  //更新时间
+    private java.util.Date updateTime;  //更新时间
 
 
 	public VideoLessonGroupDetail setId(Long id) {
@@ -75,6 +75,7 @@ public class VideoLessonGroupDetail extends BaseEntity {
 	public Long getId() {
 	    return this.id;
 	}
+
 	public VideoLessonGroupDetail setVideoLessonGroupId(Long videoLessonGroupId) {
 	    this.videoLessonGroupId = videoLessonGroupId;
 	    return this;
@@ -83,6 +84,7 @@ public class VideoLessonGroupDetail extends BaseEntity {
 	public Long getVideoLessonGroupId() {
 	    return this.videoLessonGroupId;
 	}
+
 	public VideoLessonGroupDetail setVideoTitle(String videoTitle) {
 	    this.videoTitle = videoTitle;
 	    return this;
@@ -91,6 +93,7 @@ public class VideoLessonGroupDetail extends BaseEntity {
 	public String getVideoTitle() {
 	    return this.videoTitle;
 	}
+
 	public VideoLessonGroupDetail setVideoContent(String videoContent) {
 	    this.videoContent = videoContent;
 	    return this;
@@ -99,6 +102,7 @@ public class VideoLessonGroupDetail extends BaseEntity {
 	public String getVideoContent() {
 	    return this.videoContent;
 	}
+
 	public VideoLessonGroupDetail setVideoUrl(String videoUrl) {
 	    this.videoUrl = videoUrl;
 	    return this;
@@ -107,6 +111,7 @@ public class VideoLessonGroupDetail extends BaseEntity {
 	public String getVideoUrl() {
 	    return this.videoUrl;
 	}
+
 	public VideoLessonGroupDetail setCoverUrl(String coverUrl) {
 	    this.coverUrl = coverUrl;
 	    return this;
@@ -115,6 +120,7 @@ public class VideoLessonGroupDetail extends BaseEntity {
 	public String getCoverUrl() {
 	    return this.coverUrl;
 	}
+
 	public VideoLessonGroupDetail setChargeFlag(Integer chargeFlag) {
 	    this.chargeFlag = chargeFlag;
 	    return this;
@@ -123,6 +129,7 @@ public class VideoLessonGroupDetail extends BaseEntity {
 	public Integer getChargeFlag() {
 	    return this.chargeFlag;
 	}
+
 	public VideoLessonGroupDetail setSortNumber(Integer sortNumber) {
 	    this.sortNumber = sortNumber;
 	    return this;
@@ -131,6 +138,7 @@ public class VideoLessonGroupDetail extends BaseEntity {
 	public Integer getSortNumber() {
 	    return this.sortNumber;
 	}
+
 	public VideoLessonGroupDetail setTeacherId(Long teacherId) {
 	    this.teacherId = teacherId;
 	    return this;
@@ -139,14 +147,16 @@ public class VideoLessonGroupDetail extends BaseEntity {
 	public Long getTeacherId() {
 	    return this.teacherId;
 	}
-	public VideoLessonGroupDetail setCreateTime(Date createTime) {
+
+	public VideoLessonGroupDetail setCreateTime(java.util.Date createTime) {
 	    this.createTime = createTime;
 	    return this;
 	}
 
-	public Date getCreateTime() {
+	public java.util.Date getCreateTime() {
 	    return this.createTime;
 	}
+
 	public VideoLessonGroupDetail setUpdateBy(Long updateBy) {
 	    this.updateBy = updateBy;
 	    return this;
@@ -155,42 +165,16 @@ public class VideoLessonGroupDetail extends BaseEntity {
 	public Long getUpdateBy() {
 	    return this.updateBy;
 	}
-	public VideoLessonGroupDetail setUpdateTime(Date updateTime) {
+
+	public VideoLessonGroupDetail setUpdateTime(java.util.Date updateTime) {
 	    this.updateTime = updateTime;
 	    return this;
 	}
 
-	public Date getUpdateTime() {
+	public java.util.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() {

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

@@ -12,7 +12,7 @@ import java.util.Date;
 /**
  * 视频课购买记录表
  * @author yzp
- * @date 2022-03-22 17:55:57
+ * @date 2022-03-25 23:46:29
  * @version v1.0
  **/
 @ApiModel(value = "video_lesson_purchase_record-视频课购买记录表")
@@ -32,7 +32,7 @@ public class VideoLessonPurchaseRecord extends BaseEntity {
 
     @TableField("purchase_time_")
     @ApiModelProperty(value = "购买时间")
-    private Date purchaseTime;  //购买时间
+    private java.util.Date purchaseTime;  //购买时间
 
     @TableField("pay_money_")
     @ApiModelProperty(value = "支付金额")
@@ -55,6 +55,7 @@ public class VideoLessonPurchaseRecord extends BaseEntity {
 	public Long getId() {
 	    return this.id;
 	}
+
 	public VideoLessonPurchaseRecord setVideoLessonGroupId(Long videoLessonGroupId) {
 	    this.videoLessonGroupId = videoLessonGroupId;
 	    return this;
@@ -63,6 +64,7 @@ public class VideoLessonPurchaseRecord extends BaseEntity {
 	public Long getVideoLessonGroupId() {
 	    return this.videoLessonGroupId;
 	}
+
 	public VideoLessonPurchaseRecord setStudentId(Long studentId) {
 	    this.studentId = studentId;
 	    return this;
@@ -71,14 +73,16 @@ public class VideoLessonPurchaseRecord extends BaseEntity {
 	public Long getStudentId() {
 	    return this.studentId;
 	}
-	public VideoLessonPurchaseRecord setPurchaseTime(Date purchaseTime) {
+
+	public VideoLessonPurchaseRecord setPurchaseTime(java.util.Date purchaseTime) {
 	    this.purchaseTime = purchaseTime;
 	    return this;
 	}
 
-	public Date getPurchaseTime() {
+	public java.util.Date getPurchaseTime() {
 	    return this.purchaseTime;
 	}
+
 	public VideoLessonPurchaseRecord setPayMoney(java.math.BigDecimal payMoney) {
 	    this.payMoney = payMoney;
 	    return this;
@@ -87,6 +91,7 @@ public class VideoLessonPurchaseRecord extends BaseEntity {
 	public java.math.BigDecimal getPayMoney() {
 	    return this.payMoney;
 	}
+
 	public VideoLessonPurchaseRecord setOrderNo(String orderNo) {
 	    this.orderNo = orderNo;
 	    return this;
@@ -95,6 +100,7 @@ public class VideoLessonPurchaseRecord extends BaseEntity {
 	public String getOrderNo() {
 	    return this.orderNo;
 	}
+
 	public VideoLessonPurchaseRecord setOrderStatus(Integer orderStatus) {
 	    this.orderStatus = orderStatus;
 	    return this;
@@ -104,33 +110,6 @@ public class VideoLessonPurchaseRecord extends BaseEntity {
 	    return this.orderStatus;
 	}
 
-	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() {

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

@@ -12,7 +12,7 @@ import java.util.Date;
 /**
  * 视频课学习记录表
  * @author yzp
- * @date 2022-03-22 17:55:57
+ * @date 2022-03-25 23:46:29
  * @version v1.0
  **/
 @ApiModel(value = "video_lesson_study_record-视频课学习记录表")
@@ -40,11 +40,11 @@ public class VideoLessonStudyRecord extends BaseEntity {
 
     @TableField("start_time_")
     @ApiModelProperty(value = "学习开始时间")
-    private Date startTime;  //学习开始时间
+    private java.util.Date startTime;  //学习开始时间
 
     @TableField("finish_time_")
     @ApiModelProperty(value = "学习完成时间")
-    private Date finishTime;  //学习完成时间
+    private java.util.Date finishTime;  //学习完成时间
 
 
 	public VideoLessonStudyRecord setId(Long id) {
@@ -55,6 +55,7 @@ public class VideoLessonStudyRecord extends BaseEntity {
 	public Long getId() {
 	    return this.id;
 	}
+
 	public VideoLessonStudyRecord setVideoLessonGroupId(Long videoLessonGroupId) {
 	    this.videoLessonGroupId = videoLessonGroupId;
 	    return this;
@@ -63,6 +64,7 @@ public class VideoLessonStudyRecord extends BaseEntity {
 	public Long getVideoLessonGroupId() {
 	    return this.videoLessonGroupId;
 	}
+
 	public VideoLessonStudyRecord setVideoId(Long videoId) {
 	    this.videoId = videoId;
 	    return this;
@@ -71,6 +73,7 @@ public class VideoLessonStudyRecord extends BaseEntity {
 	public Long getVideoId() {
 	    return this.videoId;
 	}
+
 	public VideoLessonStudyRecord setStudentId(Long studentId) {
 	    this.studentId = studentId;
 	    return this;
@@ -79,6 +82,7 @@ public class VideoLessonStudyRecord extends BaseEntity {
 	public Long getStudentId() {
 	    return this.studentId;
 	}
+
 	public VideoLessonStudyRecord setFinishFlag(Integer finishFlag) {
 	    this.finishFlag = finishFlag;
 	    return this;
@@ -87,50 +91,25 @@ public class VideoLessonStudyRecord extends BaseEntity {
 	public Integer getFinishFlag() {
 	    return this.finishFlag;
 	}
-	public VideoLessonStudyRecord setStartTime(Date startTime) {
+
+	public VideoLessonStudyRecord setStartTime(java.util.Date startTime) {
 	    this.startTime = startTime;
 	    return this;
 	}
 
-	public Date getStartTime() {
+	public java.util.Date getStartTime() {
 	    return this.startTime;
 	}
-	public VideoLessonStudyRecord setFinishTime(Date finishTime) {
+
+	public VideoLessonStudyRecord setFinishTime(java.util.Date finishTime) {
 	    this.finishTime = finishTime;
 	    return this;
 	}
 
-	public Date getFinishTime() {
+	public java.util.Date getFinishTime() {
 	    return this.finishTime;
 	}
 
-	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() {

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/AuthStatusEnum.java

@@ -1,5 +1,6 @@
 package com.yonge.cooleshow.biz.dal.enums;
 
+import com.baomidou.mybatisplus.annotation.EnumValue;
 import com.yonge.cooleshow.common.enums.BaseEnum;
 
 /**
@@ -9,10 +10,11 @@ import com.yonge.cooleshow.common.enums.BaseEnum;
  * @Data: 2022/3/16 10:19
  */
 public enum AuthStatusEnum implements BaseEnum<Integer, AuthStatusEnum> {
+    UNPAALY(0,"未申请"),
     DOING(1, "审核中"),
     PASS(2, "通过"),
     UNPASS(3, "不通过");
-
+    @EnumValue
     private Integer code;
 
     private String msg;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/CacheNameEnum.java

@@ -0,0 +1,67 @@
+package com.yonge.cooleshow.biz.dal.enums;
+
+import com.yonge.cooleshow.common.constant.CommonConstants;
+import com.yonge.cooleshow.common.enums.BaseEnum;
+import org.apache.commons.lang3.StringUtils;
+
+import java.time.Duration;
+
+/**
+ * redis缓存枚举
+ *
+ * @Author: liweifan
+ * @Data: 2022/3/28 16:24
+ */
+public enum CacheNameEnum implements BaseEnum<String, CacheNameEnum> {
+
+    TEACHER_HOME_TOTAL("老师首页统计缓存");
+    /***
+     * 缓存描述
+     * @author liweifan
+     * @updateTime 2022/3/28 16:31
+     */
+    private String msg;
+    /***
+     * 缓存时长
+     * @author liweifan
+     * @updateTime 2022/3/28 16:31
+     */
+    private Duration duration;
+
+    CacheNameEnum(String msg) {
+        this.msg = msg;
+    }
+
+    CacheNameEnum(String msg, Duration duration) {
+        this.msg = msg;
+        this.duration = duration;
+    }
+
+    @Override
+    public String getCode() {
+        return this.name();
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public String getRedisKey(Object... detils) {
+        String key = this.getCode();
+        for (Object detil : detils) {
+            try {
+                if (!CommonConstants.REDIS_SPLIT.equals(key.substring(key.length() - 1))) {
+                    key += CommonConstants.REDIS_SPLIT;
+                }
+                if (null != detil && StringUtils.isNotBlank(detil.toString())) {
+                    key += detil.toString();
+                }
+            } catch (Exception e) {
+            }
+        }
+        if (CommonConstants.REDIS_SPLIT.equals(key.substring(key.length() - 1))) {
+            key = key.substring(0, key.length() - 1);
+        }
+        return key;
+    }
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/TeacherTypeEnum.java

@@ -1,5 +1,6 @@
 package com.yonge.cooleshow.biz.dal.enums;
 
+import com.baomidou.mybatisplus.annotation.EnumValue;
 import com.yonge.cooleshow.common.enums.BaseEnum;
 
 /***
@@ -7,12 +8,15 @@ import com.yonge.cooleshow.common.enums.BaseEnum;
  * @author liweifan
  * @updateTime 2022/3/23 17:01
  */
+
 public enum TeacherTypeEnum implements BaseEnum<String, TeacherTypeEnum> {
     TOURIST("游客"), ENTRY("认证老师"), MUSICIAN("平台音乐人");
-
+    @EnumValue
+    private String code;
     private String msg;
 
     TeacherTypeEnum(String msg) {
+        this.code = this.name();
         this.msg = msg;
     }
 
@@ -24,4 +28,5 @@ public enum TeacherTypeEnum implements BaseEnum<String, TeacherTypeEnum> {
     public String getMsg() {
         return msg;
     }
+
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/YesOrNoEnum.java

@@ -1,11 +1,12 @@
 package com.yonge.cooleshow.biz.dal.enums;
 
+import com.baomidou.mybatisplus.annotation.EnumValue;
 import com.yonge.cooleshow.common.enums.BaseEnum;
 
 public enum YesOrNoEnum implements BaseEnum<Integer, YesOrNoEnum> {
     NO(0,"否"),
     YES(1,"是");
-
+    @EnumValue
     private Integer code;
     private String msg;
 

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

@@ -1,14 +1,14 @@
 package com.yonge.cooleshow.biz.dal.service;
 
 import com.yonge.cooleshow.biz.dal.entity.AlbumFavorite;
-import com.yonge.cooleshow.common.service.BaseService;
+import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * AlbumFavoriteService服务类
  * @author yzp
- * @date 2022-03-22 16:07:40
+ * @date 2022-03-25 23:46:28
  * @version v1.0
  **/
-public interface AlbumFavoriteService extends BaseService<Long,AlbumFavorite> {
+public interface AlbumFavoriteService extends IService<AlbumFavorite> {
 
 }

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

@@ -1,14 +1,14 @@
 package com.yonge.cooleshow.biz.dal.service;
 
 import com.yonge.cooleshow.biz.dal.entity.AlbumMusicRelate;
-import com.yonge.cooleshow.common.service.BaseService;
+import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * AlbumMusicRelateService服务类
  * @author yzp
- * @date 2022-03-22 16:07:40
+ * @date 2022-03-25 23:46:28
  * @version v1.0
  **/
-public interface AlbumMusicRelateService extends BaseService<Long,AlbumMusicRelate> {
+public interface AlbumMusicRelateService extends IService<AlbumMusicRelate> {
 
 }

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

@@ -0,0 +1,21 @@
+package com.yonge.cooleshow.biz.dal.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yonge.cooleshow.biz.dal.entity.CourseHomework;
+
+/**
+ * 课程作业表 服务类
+ * @author liweifan
+ * @date 2022-03-28
+ */
+public interface CourseHomeworkService extends IService<CourseHomework>  {
+
+
+    /**
+     * 自定义分页
+     * @author liweifan
+ 	 * @date 2022-03-28
+     */
+    IPage<CourseHomework> selectPage(IPage<CourseHomework> page, CourseHomework courseHomework);
+}

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

@@ -0,0 +1,21 @@
+package com.yonge.cooleshow.biz.dal.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yonge.cooleshow.biz.dal.entity.CourseScheduleReplied;
+
+/**
+ * 课程点评 服务类
+ * @author liweifan
+ * @date 2022-03-28
+ */
+public interface CourseScheduleRepliedService extends IService<CourseScheduleReplied>  {
+
+
+    /**
+     * 自定义分页
+     * @author liweifan
+ 	 * @date 2022-03-28
+     */
+    IPage<CourseScheduleReplied> selectPage(IPage<CourseScheduleReplied> page, CourseScheduleReplied courseScheduleReplied);
+}

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

@@ -1,14 +1,14 @@
 package com.yonge.cooleshow.biz.dal.service;
 
 import com.yonge.cooleshow.biz.dal.entity.MusicAlbum;
-import com.yonge.cooleshow.common.service.BaseService;
+import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * MusicAlbumService服务类
  * @author yzp
- * @date 2022-03-22 16:07:40
+ * @date 2022-03-25 23:46:28
  * @version v1.0
  **/
-public interface MusicAlbumService extends BaseService<Long,MusicAlbum> {
+public interface MusicAlbumService extends IService<MusicAlbum> {
 
 }

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

@@ -1,14 +1,14 @@
 package com.yonge.cooleshow.biz.dal.service;
 
 import com.yonge.cooleshow.biz.dal.entity.MusicFavorite;
-import com.yonge.cooleshow.common.service.BaseService;
+import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * MusicFavoriteService服务类
  * @author yzp
- * @date 2022-03-22 16:07:40
+ * @date 2022-03-25 23:46:28
  * @version v1.0
  **/
-public interface MusicFavoriteService extends BaseService<Long,MusicFavorite> {
+public interface MusicFavoriteService extends IService<MusicFavorite> {
 
 }

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

@@ -1,14 +1,14 @@
 package com.yonge.cooleshow.biz.dal.service;
 
 import com.yonge.cooleshow.biz.dal.entity.MusicSheetAccompaniment;
-import com.yonge.cooleshow.common.service.BaseService;
+import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * MusicSheetAccompanimentService服务类
  * @author yzp
- * @date 2022-03-22 16:07:40
+ * @date 2022-03-25 23:46:28
  * @version v1.0
  **/
-public interface MusicSheetAccompanimentService extends BaseService<Long,MusicSheetAccompaniment> {
+public interface MusicSheetAccompanimentService extends IService<MusicSheetAccompaniment> {
 
 }

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

@@ -1,14 +1,14 @@
 package com.yonge.cooleshow.biz.dal.service;
 
 import com.yonge.cooleshow.biz.dal.entity.MusicSheetPurchaseRecord;
-import com.yonge.cooleshow.common.service.BaseService;
+import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * MusicSheetPurchaseRecordService服务类
  * @author yzp
- * @date 2022-03-22 16:07:40
+ * @date 2022-03-25 23:46:28
  * @version v1.0
  **/
-public interface MusicSheetPurchaseRecordService extends BaseService<Long,MusicSheetPurchaseRecord> {
+public interface MusicSheetPurchaseRecordService extends IService<MusicSheetPurchaseRecord> {
 
 }

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

@@ -1,14 +1,22 @@
 package com.yonge.cooleshow.biz.dal.service;
 
+import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.dto.MusicSheetDto;
 import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
-import com.yonge.cooleshow.common.service.BaseService;
+import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * MusicSheetService服务类
  * @author yzp
- * @date 2022-03-22 16:07:40
+ * @date 2022-03-25 23:46:28
  * @version v1.0
  **/
-public interface MusicSheetService extends BaseService<Long,MusicSheet> {
+public interface MusicSheetService extends IService<MusicSheet> {
+    /**
+     * 保存mp3以及相应的主音或者伴奏文件
+     * @param musicSheetDto
+     * @return
+     */
+    boolean saveMp3AndAccompaniment(MusicSheetDto musicSheetDto, SysUser sysUser);
 
 }

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

@@ -11,11 +11,4 @@ import com.yonge.cooleshow.biz.dal.entity.StudentStar;
  */
 public interface StudentStarService extends IService<StudentStar>  {
 
-
-    /**
-     * 自定义分页
-     * @author liweifan
- 	 * @date 2022-03-23
-     */
-    IPage<StudentStar> selectPage(IPage<StudentStar> page, StudentStar studentStar);
 }

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

@@ -48,6 +48,13 @@ public interface TeacherAuthEntryRecordService extends IService<TeacherAuthEntry
      * @return: java.lang.Boolean
      */
     HttpResponseResult<Boolean> doApply(TeacherApplyDetailReq teacherApplyDetailDto, SysUser sysUser) throws Exception;
-
+    /***
+     * 获取最后一条申请记录
+     * @author liweifan
+     * @param: userId
+     * @updateTime 2022/3/25 15:56
+     * @return: com.yonge.cooleshow.biz.dal.entity.TeacherAuthEntryRecord
+     */
+    TeacherAuthEntryRecordVo getLastRecordByUserId(Long userId);
 
 }

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

@@ -5,7 +5,9 @@ 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.TeacherAuthEntryRecord;
 import com.yonge.cooleshow.biz.dal.entity.TeacherAuthMusicianRecord;
+import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 import com.yonge.cooleshow.biz.dal.vo.MusicianAuthEntryRecordVo;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 
@@ -38,7 +40,16 @@ public interface TeacherAuthMusicianRecordService extends IService<TeacherAuthMu
      * @updateTime 2022/3/21 19:27
      * @return: java.lang.Integer
      */
-    Integer getMusicianAuthStatus(Long id);
+    AuthStatusEnum getMusicianAuthStatus(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);
     /***
      * 提交音乐人审批申请
      * @author liweifan
@@ -47,14 +58,13 @@ 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>
+     * @param: userId
+     * @updateTime 2022/3/25 15:56
+     * @return: com.yonge.cooleshow.biz.dal.entity.TeacherAuthMusicianRecord
      */
-    HttpResponseResult<Boolean> doAuth(AuthOperaReq authOperaReq, SysUser sysUser);
+    TeacherAuthMusicianRecord getLastRecordByUserId(Long userId);
+
 }

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

@@ -2,11 +2,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.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dto.req.UserSetReq;
 import com.yonge.cooleshow.biz.dal.dto.req.TeacherSubmitReq;
 import com.yonge.cooleshow.biz.dal.dto.search.TeacherSearch;
 import com.yonge.cooleshow.biz.dal.entity.Subject;
 import com.yonge.cooleshow.biz.dal.entity.Teacher;
+import com.yonge.cooleshow.biz.dal.vo.TeacherHomeVo;
+import com.yonge.cooleshow.biz.dal.vo.TeacherTotalVo;
 import com.yonge.cooleshow.biz.dal.vo.TeacherVo;
 import com.yonge.cooleshow.biz.dal.vo.UserSetVo;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
@@ -42,6 +45,14 @@ public interface TeacherService extends IService<Teacher>  {
      */
     HttpResponseResult<Boolean> submit(TeacherSubmitReq teacherSubmitReq);
     /***
+     * 查询老师首页统计信息
+     * @author liweifan
+     * @param: id
+     * @updateTime 2022/3/28 16:49
+     * @return: com.yonge.cooleshow.biz.dal.vo.TeacherHomeVo
+     */
+    HttpResponseResult<TeacherHomeVo> queryUserInfo(SysUser user);
+    /***
      * 开通直播
      * @author liweifan
      * @param: setReq
@@ -58,4 +69,14 @@ public interface TeacherService extends IService<Teacher>  {
     * @date 2022/3/25 09:37
     */
     List<Subject> querySubject(Long userId);
+
+    /***
+     * 查询所有老师统计数据
+     * @author liweifan
+     * @updateTime 2022/3/28 10:12
+     * @return: java.util.List<com.yonge.cooleshow.biz.dal.vo.TeacherTotalVo>
+     */
+    List<TeacherTotalVo> queryTeacherHomeTotal();
+
+
 }