update

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-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/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,31 +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.entity.MusicSheetAccompaniment;
-import com.yonge.cooleshow.biz.dal.service.MusicSheetAccompanimentService;
+import com.yonge.cooleshow.biz.dal.dto.MusicSheetDto;
 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.MusicSheet;
 import com.yonge.cooleshow.biz.dal.service.MusicSheetService;
-
-import java.util.Date;
-import java.util.List;
+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/sheet")
-@Api(tags = "曲谱表 web 控制层")
+@RequestMapping("/music/sheet")
+@Api(tags = "曲谱表 API接口")
 public class MusicSheetController extends BaseController {
     @Autowired
     private SysUserFeignService sysUserFeignService;
@@ -33,44 +33,21 @@ 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 MusicSheet musicSheet) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
 
-        List<MusicSheetAccompaniment> list = null;
-        if (!musicSheet.getAudioType().equalsIgnoreCase("midi")){
-            list = musicSheet.getBackground();
-            if (list.isEmpty()){
-                return failed("mp3音频文件对应的主音或者伴奏文件没有提供");
-            }
-        }
-
-        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);
-            }
-        }
-
-        return succeed("曲谱创建成功");
+        //musicSheet.setCreateBy(sysUser.getId());
+        //musicSheet.setCreateTime(new Date());
+        musicSheetService.save(musicSheet);
+        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 +55,13 @@ public class MusicSheetController extends BaseController {
             return failed("用户信息获取失败");
         }
 
-        musicSheetService.delete(id);
+        musicSheetService.removeById(id);
         return succeed();
     }
 
-    @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("用户信息获取失败");
@@ -95,20 +72,20 @@ public class MusicSheetController extends BaseController {
 
         //musicSheet.setUpdateBy(sysUser.getId());
         //musicSheet.setUpdateTime(new Date());
-        musicSheetService.update(musicSheet);
+        musicSheetService.updateById(musicSheet);
         return succeed();
     }
 
-    @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 = musicSheetDto.getPageNo();
+        int pageSize = musicSheetDto.getPageSize();
 
         try {
             if (pageNo==0) {
@@ -118,11 +95,14 @@ public class MusicSheetController extends BaseController {
                 pageSize = 10;
             }
 
-            PageHelper.startPage(pageNo,pageSize);
-            return succeed(musicSheetService.findList(musicSheet));
+            LambdaQueryWrapper<MusicSheet> lambdaQueryWrapper = Wrappers.lambdaQuery();
+            //lambdaQueryWrapper.like(MusicSheet::getName , "k");
+
+            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/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/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/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,14 @@
 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;
 
 /**
  * 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/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,40 @@
+package com.yonge.cooleshow.biz.dal.dto;
+
+import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
+
+/**
+ * MusicSheetDto
+ * @author yzp
+ * @date   2022-03-25 23:46:28
+ * @version v1.0
+ **/
+public class MusicSheetDto extends MusicSheet {
+    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/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/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/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;
@@ -8,18 +7,12 @@ import com.baomidou.mybatisplus.annotation.TableId;
 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-曲谱表")
@@ -29,28 +22,22 @@ public class MusicSheet extends BaseEntity {
     @ApiModelProperty(value = "主键id")
     private Long id;  //主键ID
 
-    @NotBlank(message = "曲谱名称不能为空!")
-    @Size(max = 64, message = "曲谱名称长度不能超过64位!")
     @TableField("music_sheet_name_")
     @ApiModelProperty(value = "曲谱名称")
     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位!")
     @TableField("composer_")
     @ApiModelProperty(value = "作曲人")
     private String composer;  //作曲人
 
-    @NotBlank(message = "曲谱声部不能为空!")
     @TableField("music_subject_")
     @ApiModelProperty(value = "曲谱声部(适用的乐器,可能是多个,用逗号分隔)")
     private String musicSubject;  //曲谱声部(适用的乐器,可能是多个,用逗号分隔)
 
-    @NotBlank(message = "曲谱音频文件类型不能为空!")
     @TableField("audio_type_")
     @ApiModelProperty(value = "曲谱音频文件类型(midi;mp3)")
     private String audioType;  //曲谱音频文件类型(midi;mp3)
@@ -71,7 +58,6 @@ public class MusicSheet extends BaseEntity {
     @ApiModelProperty(value = "是否展示指法(0:否;1:是)")
     private Integer showFingering;  //是否展示指法(0:否;1:是)
 
-    @NotNull(message = "收费类型不能为空!")
     @TableField("charge_type_")
     @ApiModelProperty(value = "收费类型(0:免费;1:会员;2:单曲收费)")
     private Integer chargeType;  //收费类型(0:免费;1:会员;2:单曲收费)
@@ -96,12 +82,10 @@ public class MusicSheet extends BaseEntity {
     @ApiModelProperty(value = "曲谱价格")
     private java.math.BigDecimal musicPrice;  //曲谱价格
 
-    @NotBlank(message = "音频文件存储路径不能为空!")
     @TableField("audio_file_url_")
     @ApiModelProperty(value = "音频文件存储路径")
     private String audioFileUrl;  //音频文件存储路径
 
-    @NotBlank(message = "XML文件存储路径不能为空!")
     @TableField("xml_file_url_")
     @ApiModelProperty(value = "XML文件存储路径")
     private String xmlFileUrl;  //XML文件存储路径
@@ -112,7 +96,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 +104,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,7 +112,6 @@ public class MusicSheet extends BaseEntity {
 
     @TableField("remark_")
     @ApiModelProperty(value = "备注")
-    @JsonIgnore
     private String remark;  //备注
 
 
@@ -140,6 +123,7 @@ public class MusicSheet extends BaseEntity {
 	public Long getId() {
 	    return this.id;
 	}
+
 	public MusicSheet setMusicSheetName(String musicSheetName) {
 	    this.musicSheetName = musicSheetName;
 	    return this;
@@ -148,6 +132,7 @@ public class MusicSheet extends BaseEntity {
 	public String getMusicSheetName() {
 	    return this.musicSheetName;
 	}
+
 	public MusicSheet setUserId(Long userId) {
 	    this.userId = userId;
 	    return this;
@@ -156,6 +141,7 @@ public class MusicSheet extends BaseEntity {
 	public Long getUserId() {
 	    return this.userId;
 	}
+
 	public MusicSheet setComposer(String composer) {
 	    this.composer = composer;
 	    return this;
@@ -164,6 +150,7 @@ public class MusicSheet extends BaseEntity {
 	public String getComposer() {
 	    return this.composer;
 	}
+
 	public MusicSheet setMusicSubject(String musicSubject) {
 	    this.musicSubject = musicSubject;
 	    return this;
@@ -172,6 +159,7 @@ public class MusicSheet extends BaseEntity {
 	public String getMusicSubject() {
 	    return this.musicSubject;
 	}
+
 	public MusicSheet setAudioType(String audioType) {
 	    this.audioType = audioType;
 	    return this;
@@ -180,6 +168,7 @@ public class MusicSheet extends BaseEntity {
 	public String getAudioType() {
 	    return this.audioType;
 	}
+
 	public MusicSheet setMusicTag(String musicTag) {
 	    this.musicTag = musicTag;
 	    return this;
@@ -188,6 +177,7 @@ public class MusicSheet extends BaseEntity {
 	public String getMusicTag() {
 	    return this.musicTag;
 	}
+
 	public MusicSheet setPlaySpeed(Integer playSpeed) {
 	    this.playSpeed = playSpeed;
 	    return this;
@@ -196,6 +186,7 @@ public class MusicSheet extends BaseEntity {
 	public Integer getPlaySpeed() {
 	    return this.playSpeed;
 	}
+
 	public MusicSheet setCanEvaluate(Integer canEvaluate) {
 	    this.canEvaluate = canEvaluate;
 	    return this;
@@ -204,6 +195,7 @@ public class MusicSheet extends BaseEntity {
 	public Integer getCanEvaluate() {
 	    return this.canEvaluate;
 	}
+
 	public MusicSheet setShowFingering(Integer showFingering) {
 	    this.showFingering = showFingering;
 	    return this;
@@ -212,6 +204,7 @@ public class MusicSheet extends BaseEntity {
 	public Integer getShowFingering() {
 	    return this.showFingering;
 	}
+
 	public MusicSheet setChargeType(Integer chargeType) {
 	    this.chargeType = chargeType;
 	    return this;
@@ -220,6 +213,7 @@ public class MusicSheet extends BaseEntity {
 	public Integer getChargeType() {
 	    return this.chargeType;
 	}
+
 	public MusicSheet setAuditStatus(Integer auditStatus) {
 	    this.auditStatus = auditStatus;
 	    return this;
@@ -228,6 +222,7 @@ public class MusicSheet extends BaseEntity {
 	public Integer getAuditStatus() {
 	    return this.auditStatus;
 	}
+
 	public MusicSheet setSortNumber(Integer sortNumber) {
 	    this.sortNumber = sortNumber;
 	    return this;
@@ -236,6 +231,7 @@ public class MusicSheet extends BaseEntity {
 	public Integer getSortNumber() {
 	    return this.sortNumber;
 	}
+
 	public MusicSheet setTopFlag(Integer topFlag) {
 	    this.topFlag = topFlag;
 	    return this;
@@ -244,6 +240,7 @@ public class MusicSheet extends BaseEntity {
 	public Integer getTopFlag() {
 	    return this.topFlag;
 	}
+
 	public MusicSheet setHotFlag(Integer hotFlag) {
 	    this.hotFlag = hotFlag;
 	    return this;
@@ -252,6 +249,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 +258,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 +267,7 @@ public class MusicSheet extends BaseEntity {
 	public String getAudioFileUrl() {
 	    return this.audioFileUrl;
 	}
+
 	public MusicSheet setXmlFileUrl(String xmlFileUrl) {
 	    this.xmlFileUrl = xmlFileUrl;
 	    return this;
@@ -276,6 +276,7 @@ public class MusicSheet extends BaseEntity {
 	public String getXmlFileUrl() {
 	    return this.xmlFileUrl;
 	}
+
 	public MusicSheet setHasBeat(Integer hasBeat) {
 	    this.hasBeat = hasBeat;
 	    return this;
@@ -284,14 +285,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 +303,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 +321,7 @@ public class MusicSheet extends BaseEntity {
 	public Long getUpdateBy() {
 	    return this.updateBy;
 	}
+
 	public MusicSheet setRemark(String remark) {
 	    this.remark = remark;
 	    return this;
@@ -325,49 +331,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/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/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/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,14 @@
 package com.yonge.cooleshow.biz.dal.service;
 
 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> {
 
 }

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

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

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

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

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

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

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

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

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

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

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

@@ -3,25 +3,27 @@ package com.yonge.cooleshow.biz.dal.service.impl;
 import com.yonge.cooleshow.biz.dal.entity.AlbumFavorite;
 import com.yonge.cooleshow.biz.dal.dao.AlbumFavoriteDao;
 import com.yonge.cooleshow.biz.dal.service.AlbumFavoriteService;
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
-import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 /**
  * AlbumFavoriteService服务实现类
  * @author yzp
- * @date 2022-03-22 18:03:01
+ * @date 2022-03-26 00:01:37
  * @version v1.0
  **/
 @Service
-public class AlbumFavoriteServiceImpl extends BaseServiceImpl<Long,AlbumFavorite> implements AlbumFavoriteService {
+public class AlbumFavoriteServiceImpl extends ServiceImpl<AlbumFavoriteDao,AlbumFavorite> implements AlbumFavoriteService {
+
+    private final static Logger log = LoggerFactory.getLogger(AlbumFavoriteServiceImpl.class);
+
     @Autowired
     private AlbumFavoriteDao albumFavoriteDao;
 
-    @Override
-    public BaseDAO<Long, AlbumFavorite> getDAO() {
+    public AlbumFavoriteDao getDao() {
         return albumFavoriteDao;
     }
 }

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

@@ -3,25 +3,27 @@ package com.yonge.cooleshow.biz.dal.service.impl;
 import com.yonge.cooleshow.biz.dal.entity.AlbumMusicRelate;
 import com.yonge.cooleshow.biz.dal.dao.AlbumMusicRelateDao;
 import com.yonge.cooleshow.biz.dal.service.AlbumMusicRelateService;
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
-import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 /**
  * AlbumMusicRelateService服务实现类
  * @author yzp
- * @date 2022-03-22 18:03:02
+ * @date 2022-03-26 00:01:37
  * @version v1.0
  **/
 @Service
-public class AlbumMusicRelateServiceImpl extends BaseServiceImpl<Long,AlbumMusicRelate> implements AlbumMusicRelateService {
+public class AlbumMusicRelateServiceImpl extends ServiceImpl<AlbumMusicRelateDao,AlbumMusicRelate> implements AlbumMusicRelateService {
+
+    private final static Logger log = LoggerFactory.getLogger(AlbumMusicRelateServiceImpl.class);
+
     @Autowired
     private AlbumMusicRelateDao albumMusicRelateDao;
 
-    @Override
-    public BaseDAO<Long, AlbumMusicRelate> getDAO() {
+    public AlbumMusicRelateDao getDao() {
         return albumMusicRelateDao;
     }
 }

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

@@ -3,25 +3,27 @@ package com.yonge.cooleshow.biz.dal.service.impl;
 import com.yonge.cooleshow.biz.dal.entity.MusicAlbum;
 import com.yonge.cooleshow.biz.dal.dao.MusicAlbumDao;
 import com.yonge.cooleshow.biz.dal.service.MusicAlbumService;
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
-import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 /**
  * MusicAlbumService服务实现类
  * @author yzp
- * @date 2022-03-22 18:03:02
+ * @date 2022-03-26 00:01:37
  * @version v1.0
  **/
 @Service
-public class MusicAlbumServiceImpl extends BaseServiceImpl<Long,MusicAlbum> implements MusicAlbumService {
+public class MusicAlbumServiceImpl extends ServiceImpl<MusicAlbumDao,MusicAlbum> implements MusicAlbumService {
+
+    private final static Logger log = LoggerFactory.getLogger(MusicAlbumServiceImpl.class);
+
     @Autowired
     private MusicAlbumDao musicAlbumDao;
 
-    @Override
-    public BaseDAO<Long, MusicAlbum> getDAO() {
+    public MusicAlbumDao getDao() {
         return musicAlbumDao;
     }
 }

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

@@ -3,24 +3,27 @@ package com.yonge.cooleshow.biz.dal.service.impl;
 import com.yonge.cooleshow.biz.dal.entity.MusicFavorite;
 import com.yonge.cooleshow.biz.dal.dao.MusicFavoriteDao;
 import com.yonge.cooleshow.biz.dal.service.MusicFavoriteService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
-import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 /**
  * MusicFavoriteService服务实现类
  * @author yzp
- * @date 2022-03-22 18:03:02
+ * @date 2022-03-26 00:01:37
  * @version v1.0
  **/
 @Service
-public class MusicFavoriteServiceImpl extends BaseServiceImpl<Long,MusicFavorite> implements MusicFavoriteService {
+public class MusicFavoriteServiceImpl extends ServiceImpl<MusicFavoriteDao,MusicFavorite> implements MusicFavoriteService {
+
+    private final static Logger log = LoggerFactory.getLogger(MusicFavoriteServiceImpl.class);
+
     @Autowired
     private MusicFavoriteDao musicFavoriteDao;
 
-    @Override
-    public BaseDAO<Long, MusicFavorite> getDAO() {
+    public MusicFavoriteDao getDao() {
         return musicFavoriteDao;
     }
 }

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

@@ -3,25 +3,27 @@ package com.yonge.cooleshow.biz.dal.service.impl;
 import com.yonge.cooleshow.biz.dal.entity.MusicSheetAccompaniment;
 import com.yonge.cooleshow.biz.dal.dao.MusicSheetAccompanimentDao;
 import com.yonge.cooleshow.biz.dal.service.MusicSheetAccompanimentService;
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
-import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 /**
  * MusicSheetAccompanimentService服务实现类
  * @author yzp
- * @date 2022-03-22 18:03:02
+ * @date 2022-03-26 00:01:37
  * @version v1.0
  **/
 @Service
-public class MusicSheetAccompanimentServiceImpl extends BaseServiceImpl<Long,MusicSheetAccompaniment> implements MusicSheetAccompanimentService {
+public class MusicSheetAccompanimentServiceImpl extends ServiceImpl<MusicSheetAccompanimentDao,MusicSheetAccompaniment> implements MusicSheetAccompanimentService {
+
+    private final static Logger log = LoggerFactory.getLogger(MusicSheetAccompanimentServiceImpl.class);
+
     @Autowired
     private MusicSheetAccompanimentDao musicSheetAccompanimentDao;
 
-    @Override
-    public BaseDAO<Long, MusicSheetAccompaniment> getDAO() {
+    public MusicSheetAccompanimentDao getDao() {
         return musicSheetAccompanimentDao;
     }
 }

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

@@ -3,24 +3,27 @@ package com.yonge.cooleshow.biz.dal.service.impl;
 import com.yonge.cooleshow.biz.dal.entity.MusicSheetPurchaseRecord;
 import com.yonge.cooleshow.biz.dal.dao.MusicSheetPurchaseRecordDao;
 import com.yonge.cooleshow.biz.dal.service.MusicSheetPurchaseRecordService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
-import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 /**
  * MusicSheetPurchaseRecordService服务实现类
  * @author yzp
- * @date 2022-03-22 18:03:02
+ * @date 2022-03-26 00:01:38
  * @version v1.0
  **/
 @Service
-public class MusicSheetPurchaseRecordServiceImpl extends BaseServiceImpl<Long,MusicSheetPurchaseRecord> implements MusicSheetPurchaseRecordService {
+public class MusicSheetPurchaseRecordServiceImpl extends ServiceImpl<MusicSheetPurchaseRecordDao,MusicSheetPurchaseRecord> implements MusicSheetPurchaseRecordService {
+
+    private final static Logger log = LoggerFactory.getLogger(MusicSheetPurchaseRecordServiceImpl.class);
+
     @Autowired
     private MusicSheetPurchaseRecordDao musicSheetPurchaseRecordDao;
 
-    @Override
-    public BaseDAO<Long, MusicSheetPurchaseRecord> getDAO() {
+    public MusicSheetPurchaseRecordDao getDao() {
         return musicSheetPurchaseRecordDao;
     }
 }

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

@@ -3,24 +3,27 @@ package com.yonge.cooleshow.biz.dal.service.impl;
 import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
 import com.yonge.cooleshow.biz.dal.dao.MusicSheetDao;
 import com.yonge.cooleshow.biz.dal.service.MusicSheetService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
-import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 /**
  * MusicSheetService服务实现类
  * @author yzp
- * @date 2022-03-22 18:03:02
+ * @date 2022-03-26 00:01:37
  * @version v1.0
  **/
 @Service
-public class MusicSheetServiceImpl extends BaseServiceImpl<Long,MusicSheet> implements MusicSheetService {
+public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao,MusicSheet> implements MusicSheetService {
+
+    private final static Logger log = LoggerFactory.getLogger(MusicSheetServiceImpl.class);
+
     @Autowired
     private MusicSheetDao musicSheetDao;
 
-    @Override
-    public BaseDAO<Long, MusicSheet> getDAO() {
+    public MusicSheetDao getDao() {
         return musicSheetDao;
     }
 }

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

@@ -47,7 +47,7 @@ public class SmsCodeServiceImpl implements SmsCodeService {
 		SysConfig sysConfig = sysConfigService.findByParamName(SysConfigService.SMS_MAX_TIMES);
 		int times = 3;
 		if (sysConfig != null) {
-			times = Integer.parseInt(sysConfig.getParanValue());
+			times = Integer.parseInt(sysConfig.getParamValue());
 		}
 		// 十分钟内只能发3条
 		List<SysMessage> list = sysMessageService.queryUserInRecentMinList(mobile, 10, MessageSendMode.SMS);

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

@@ -3,25 +3,27 @@ package com.yonge.cooleshow.biz.dal.service.impl;
 import com.yonge.cooleshow.biz.dal.entity.VideoLessonEvaluate;
 import com.yonge.cooleshow.biz.dal.dao.VideoLessonEvaluateDao;
 import com.yonge.cooleshow.biz.dal.service.VideoLessonEvaluateService;
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
-import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 /**
  * VideoLessonEvaluateService服务实现类
  * @author yzp
- * @date 2022-03-22 18:03:02
+ * @date 2022-03-26 00:01:38
  * @version v1.0
  **/
 @Service
-public class VideoLessonEvaluateServiceImpl extends BaseServiceImpl<Long,VideoLessonEvaluate> implements VideoLessonEvaluateService {
+public class VideoLessonEvaluateServiceImpl extends ServiceImpl<VideoLessonEvaluateDao,VideoLessonEvaluate> implements VideoLessonEvaluateService {
+
+    private final static Logger log = LoggerFactory.getLogger(VideoLessonEvaluateServiceImpl.class);
+
     @Autowired
     private VideoLessonEvaluateDao videoLessonEvaluateDao;
 
-    @Override
-    public BaseDAO<Long, VideoLessonEvaluate> getDAO() {
+    public VideoLessonEvaluateDao getDao() {
         return videoLessonEvaluateDao;
     }
 }

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

@@ -3,24 +3,27 @@ package com.yonge.cooleshow.biz.dal.service.impl;
 import com.yonge.cooleshow.biz.dal.entity.VideoLessonGroupDetail;
 import com.yonge.cooleshow.biz.dal.dao.VideoLessonGroupDetailDao;
 import com.yonge.cooleshow.biz.dal.service.VideoLessonGroupDetailService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
-import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 /**
  * VideoLessonGroupDetailService服务实现类
  * @author yzp
- * @date 2022-03-22 18:03:02
+ * @date 2022-03-26 00:01:38
  * @version v1.0
  **/
 @Service
-public class VideoLessonGroupDetailServiceImpl extends BaseServiceImpl<Long,VideoLessonGroupDetail> implements VideoLessonGroupDetailService {
+public class VideoLessonGroupDetailServiceImpl extends ServiceImpl<VideoLessonGroupDetailDao,VideoLessonGroupDetail> implements VideoLessonGroupDetailService {
+
+    private final static Logger log = LoggerFactory.getLogger(VideoLessonGroupDetailServiceImpl.class);
+
     @Autowired
     private VideoLessonGroupDetailDao videoLessonGroupDetailDao;
 
-    @Override
-    public BaseDAO<Long, VideoLessonGroupDetail> getDAO() {
+    public VideoLessonGroupDetailDao getDao() {
         return videoLessonGroupDetailDao;
     }
 }

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

@@ -3,24 +3,27 @@ package com.yonge.cooleshow.biz.dal.service.impl;
 import com.yonge.cooleshow.biz.dal.entity.VideoLessonGroup;
 import com.yonge.cooleshow.biz.dal.dao.VideoLessonGroupDao;
 import com.yonge.cooleshow.biz.dal.service.VideoLessonGroupService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
-import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 /**
  * VideoLessonGroupService服务实现类
  * @author yzp
- * @date 2022-03-22 18:03:02
+ * @date 2022-03-26 00:01:38
  * @version v1.0
  **/
 @Service
-public class VideoLessonGroupServiceImpl extends BaseServiceImpl<Long,VideoLessonGroup> implements VideoLessonGroupService {
+public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao,VideoLessonGroup> implements VideoLessonGroupService {
+
+    private final static Logger log = LoggerFactory.getLogger(VideoLessonGroupServiceImpl.class);
+
     @Autowired
     private VideoLessonGroupDao videoLessonGroupDao;
 
-    @Override
-    public BaseDAO<Long, VideoLessonGroup> getDAO() {
+    public VideoLessonGroupDao getDao() {
         return videoLessonGroupDao;
     }
 }

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

@@ -3,24 +3,27 @@ package com.yonge.cooleshow.biz.dal.service.impl;
 import com.yonge.cooleshow.biz.dal.entity.VideoLessonPurchaseRecord;
 import com.yonge.cooleshow.biz.dal.dao.VideoLessonPurchaseRecordDao;
 import com.yonge.cooleshow.biz.dal.service.VideoLessonPurchaseRecordService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
-import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 /**
  * VideoLessonPurchaseRecordService服务实现类
  * @author yzp
- * @date 2022-03-22 18:03:02
+ * @date 2022-03-26 00:01:38
  * @version v1.0
  **/
 @Service
-public class VideoLessonPurchaseRecordServiceImpl extends BaseServiceImpl<Long,VideoLessonPurchaseRecord> implements VideoLessonPurchaseRecordService {
+public class VideoLessonPurchaseRecordServiceImpl extends ServiceImpl<VideoLessonPurchaseRecordDao,VideoLessonPurchaseRecord> implements VideoLessonPurchaseRecordService {
+
+    private final static Logger log = LoggerFactory.getLogger(VideoLessonPurchaseRecordServiceImpl.class);
+
     @Autowired
     private VideoLessonPurchaseRecordDao videoLessonPurchaseRecordDao;
 
-    @Override
-    public BaseDAO<Long, VideoLessonPurchaseRecord> getDAO() {
+    public VideoLessonPurchaseRecordDao getDao() {
         return videoLessonPurchaseRecordDao;
     }
 }

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

@@ -3,24 +3,27 @@ package com.yonge.cooleshow.biz.dal.service.impl;
 import com.yonge.cooleshow.biz.dal.entity.VideoLessonStudyRecord;
 import com.yonge.cooleshow.biz.dal.dao.VideoLessonStudyRecordDao;
 import com.yonge.cooleshow.biz.dal.service.VideoLessonStudyRecordService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
-import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
-import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 /**
  * VideoLessonStudyRecordService服务实现类
  * @author yzp
- * @date 2022-03-22 18:03:02
+ * @date 2022-03-26 00:01:38
  * @version v1.0
  **/
 @Service
-public class VideoLessonStudyRecordServiceImpl extends BaseServiceImpl<Long,VideoLessonStudyRecord> implements VideoLessonStudyRecordService {
+public class VideoLessonStudyRecordServiceImpl extends ServiceImpl<VideoLessonStudyRecordDao,VideoLessonStudyRecord> implements VideoLessonStudyRecordService {
+
+    private final static Logger log = LoggerFactory.getLogger(VideoLessonStudyRecordServiceImpl.class);
+
     @Autowired
     private VideoLessonStudyRecordDao videoLessonStudyRecordDao;
 
-    @Override
-    public BaseDAO<Long, VideoLessonStudyRecord> getDAO() {
+    public VideoLessonStudyRecordDao getDao() {
         return videoLessonStudyRecordDao;
     }
 }

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

@@ -15,83 +15,6 @@
 		id_, user_id_, album_id_, favorite_time_, favorite_flag_
 	</sql>
 
-	<select id="get" parameterType="Long" resultMap="BaseResultMap">
-		 select
-		 <include refid="Base_Column_List" />
-		 from album_favorite
-		 where id_ = #{id}
-	</select>
 
-	<delete id="delete" parameterType="Long">
-		 delete from album_favorite
-		 where id_ = #{id}
-	</delete>
-	
-	<delete id="delete" parameterType="com.yonge.cooleshow.biz.dal.entity.AlbumFavorite">
-		 delete from album_favorite
-		 where 1=1
-		 	<if test="userId != null and userId != ''">
-				 and user_id_ = #{userId}
-			</if>
-		 	<if test="albumId != null and albumId != ''">
-				 and album_id_ = #{albumId}
-			</if>
-		 	<if test="favoriteTime != null and favoriteTime != ''">
-				 and favorite_time_ = #{favoriteTime}
-			</if>
-		 	<if test="favoriteFlag != null and favoriteFlag != ''">
-				 and favorite_flag_ = #{favoriteFlag}
-			</if>
-	</delete>
-	
-	<insert id="insert" parameterType="com.yonge.cooleshow.biz.dal.entity.AlbumFavorite">
-		 insert into album_favorite
- 		 (user_id_,album_id_,favorite_time_,favorite_flag_)
-		 values 
- 		 (#{userId},#{albumId},#{favoriteTime},#{favoriteFlag})
-	</insert>
-	
-	<update id="update" parameterType="com.yonge.cooleshow.biz.dal.entity.AlbumFavorite">
-		 update album_favorite
- 		 <set>
-		 	   		<if test="userId != null">
-		 	   			 user_id_ = #{userId},
-					</if>
-		 	   		<if test="albumId != null">
-		 	   			 album_id_ = #{albumId},
-					</if>
-		 	   		<if test="favoriteTime != null">
-		 	   			 favorite_time_ = #{favoriteTime},
-					</if>
-		 	   		<if test="favoriteFlag != null">
-		 	   			 favorite_flag_ = #{favoriteFlag},
-					</if>
- 		 </set>
-		 where id_ = #{id}
-	</update>
-
-	<select id="findAll" resultMap="BaseResultMap">
-        SELECT * FROM album_favorite
-        ORDER BY id_ desc
-    </select>
-
-	<select id="findList" parameterType="com.yonge.cooleshow.biz.dal.entity.AlbumFavorite" resultMap="BaseResultMap">
-		 select
-		 <include refid="Base_Column_List" />
-		 from album_favorite
-		 where 1=1 
-                    <if test="userId != null">
-                         and user_id_ = #{userId}
-                    </if>
-                    <if test="albumId != null">
-                         and album_id_ = #{albumId}
-                    </if>
-                    <if test="favoriteTime != null">
-                         and favorite_time_ = #{favoriteTime}
-                    </if>
-                    <if test="favoriteFlag != null">
-                         and favorite_flag_ = #{favoriteFlag}
-                    </if>
-	</select>
 
 </mapper>

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

@@ -16,92 +16,6 @@
 		id_, album_id_, music_sheet_id_, sort_number_, create_time_, create_by_
 	</sql>
 
-	<select id="get" parameterType="Long" resultMap="BaseResultMap">
-		 select
-		 <include refid="Base_Column_List" />
-		 from album_music_relate
-		 where id_ = #{id}
-	</select>
 
-	<delete id="delete" parameterType="Long">
-		 delete from album_music_relate
-		 where id_ = #{id}
-	</delete>
-	
-	<delete id="delete" parameterType="com.yonge.cooleshow.biz.dal.entity.AlbumMusicRelate">
-		 delete from album_music_relate
-		 where 1=1
-		 	<if test="albumId != null and albumId != ''">
-				 and album_id_ = #{albumId}
-			</if>
-		 	<if test="musicSheetId != null and musicSheetId != ''">
-				 and music_sheet_id_ = #{musicSheetId}
-			</if>
-		 	<if test="sortNumber != null and sortNumber != ''">
-				 and sort_number_ = #{sortNumber}
-			</if>
-		 	<if test="createTime != null and createTime != ''">
-				 and create_time_ = #{createTime}
-			</if>
-		 	<if test="createBy != null and createBy != ''">
-				 and create_by_ = #{createBy}
-			</if>
-	</delete>
-	
-	<insert id="insert" parameterType="com.yonge.cooleshow.biz.dal.entity.AlbumMusicRelate">
-		 insert into album_music_relate
- 		 (album_id_,music_sheet_id_,sort_number_,create_time_,create_by_)
-		 values 
- 		 (#{albumId},#{musicSheetId},#{sortNumber},sysdate(),#{createBy})
-	</insert>
-	
-	<update id="update" parameterType="com.yonge.cooleshow.biz.dal.entity.AlbumMusicRelate">
-		 update album_music_relate
- 		 <set>
-		 	   		<if test="albumId != null">
-		 	   			 album_id_ = #{albumId},
-					</if>
-		 	   		<if test="musicSheetId != null">
-		 	   			 music_sheet_id_ = #{musicSheetId},
-					</if>
-		 	   		<if test="sortNumber != null">
-		 	   			 sort_number_ = #{sortNumber},
-					</if>
-		 	   		<if test="createTime != null">
-		 	   			 create_time_ = #{createTime},
-					</if>
-		 	   		<if test="createBy != null">
-		 	   			 create_by_ = #{createBy},
-					</if>
- 		 </set>
-		 where id_ = #{id}
-	</update>
-
-	<select id="findAll" resultMap="BaseResultMap">
-        SELECT * FROM album_music_relate
-        ORDER BY id_ desc
-    </select>
-
-	<select id="findList" parameterType="com.yonge.cooleshow.biz.dal.entity.AlbumMusicRelate" resultMap="BaseResultMap">
-		 select
-		 <include refid="Base_Column_List" />
-		 from album_music_relate
-		 where 1=1 
-                    <if test="albumId != null">
-                         and album_id_ = #{albumId}
-                    </if>
-                    <if test="musicSheetId != null">
-                         and music_sheet_id_ = #{musicSheetId}
-                    </if>
-                    <if test="sortNumber != null">
-                         and sort_number_ = #{sortNumber}
-                    </if>
-                    <if test="createTime != null">
-                         and create_time_ = #{createTime}
-                    </if>
-                    <if test="createBy != null">
-                         and create_by_ = #{createBy}
-                    </if>
-	</select>
 
 </mapper>

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

@@ -23,155 +23,6 @@
 		id_, album_name_, album_desc_, album_tag_, album_cover_url_, album_status_, sort_number_, hot_flag_, top_flag_, create_time_, create_by_, update_time_, update_by_
 	</sql>
 
-	<select id="get" parameterType="Long" resultMap="BaseResultMap">
-		 select
-		 <include refid="Base_Column_List" />
-		 from music_album
-		 where id_ = #{id}
-	</select>
 
-	<delete id="delete" parameterType="Long">
-		 delete from music_album
-		 where id_ = #{id}
-	</delete>
-	
-	<delete id="delete" parameterType="com.yonge.cooleshow.biz.dal.entity.MusicAlbum">
-		 delete from music_album
-		 where 1=1
-		 	<if test="albumName != null and albumName != ''">
-				 and album_name_ = #{albumName}
-			</if>
-		 	<if test="albumDesc != null and albumDesc != ''">
-				 and album_desc_ = #{albumDesc}
-			</if>
-		 	<if test="albumTag != null and albumTag != ''">
-				 and album_tag_ = #{albumTag}
-			</if>
-		 	<if test="albumCoverUrl != null and albumCoverUrl != ''">
-				 and album_cover_url_ = #{albumCoverUrl}
-			</if>
-		 	<if test="albumStatus != null and albumStatus != ''">
-				 and album_status_ = #{albumStatus}
-			</if>
-		 	<if test="sortNumber != null and sortNumber != ''">
-				 and sort_number_ = #{sortNumber}
-			</if>
-		 	<if test="hotFlag != null and hotFlag != ''">
-				 and hot_flag_ = #{hotFlag}
-			</if>
-		 	<if test="topFlag != null and topFlag != ''">
-				 and top_flag_ = #{topFlag}
-			</if>
-		 	<if test="createTime != null and createTime != ''">
-				 and create_time_ = #{createTime}
-			</if>
-		 	<if test="createBy != null and createBy != ''">
-				 and create_by_ = #{createBy}
-			</if>
-		 	<if test="updateTime != null and updateTime != ''">
-				 and update_time_ = #{updateTime}
-			</if>
-		 	<if test="updateBy != null and updateBy != ''">
-				 and update_by_ = #{updateBy}
-			</if>
-	</delete>
-	
-	<insert id="insert" parameterType="com.yonge.cooleshow.biz.dal.entity.MusicAlbum">
-		 insert into music_album
- 		 (album_name_,album_desc_,album_tag_,album_cover_url_,album_status_,sort_number_,hot_flag_,top_flag_,create_time_,create_by_,update_time_,update_by_)
-		 values 
- 		 (#{albumName},#{albumDesc},#{albumTag},#{albumCoverUrl},#{albumStatus},#{sortNumber},#{hotFlag},#{topFlag},sysdate(),#{createBy},#{updateTime},#{updateBy})
-	</insert>
-	
-	<update id="update" parameterType="com.yonge.cooleshow.biz.dal.entity.MusicAlbum">
-		 update music_album
- 		 <set>
-				 	<if test="albumName != null and albumName != ''">
-						 album_name_ = #{albumName},
-					</if>
-				 	<if test="albumDesc != null and albumDesc != ''">
-						 album_desc_ = #{albumDesc},
-					</if>
-				 	<if test="albumTag != null and albumTag != ''">
-						 album_tag_ = #{albumTag},
-					</if>
-				 	<if test="albumCoverUrl != null and albumCoverUrl != ''">
-						 album_cover_url_ = #{albumCoverUrl},
-					</if>
-		 	   		<if test="albumStatus != null">
-		 	   			 album_status_ = #{albumStatus},
-					</if>
-		 	   		<if test="sortNumber != null">
-		 	   			 sort_number_ = #{sortNumber},
-					</if>
-		 	   		<if test="hotFlag != null">
-		 	   			 hot_flag_ = #{hotFlag},
-					</if>
-		 	   		<if test="topFlag != null">
-		 	   			 top_flag_ = #{topFlag},
-					</if>
-		 	   		<if test="createTime != null">
-		 	   			 create_time_ = #{createTime},
-					</if>
-		 	   		<if test="createBy != null">
-		 	   			 create_by_ = #{createBy},
-					</if>
-		 	   		<if test="updateTime != null">
-		 	   			 update_time_ = #{updateTime},
-					</if>
-		 	   		<if test="updateBy != null">
-		 	   			 update_by_ = #{updateBy},
-					</if>
- 		 </set>
-		 where id_ = #{id}
-	</update>
-
-	<select id="findAll" resultMap="BaseResultMap">
-        SELECT * FROM music_album
-        ORDER BY id_ desc
-    </select>
-
-	<select id="findList" parameterType="com.yonge.cooleshow.biz.dal.entity.MusicAlbum" resultMap="BaseResultMap">
-		 select
-		 <include refid="Base_Column_List" />
-		 from music_album
-		 where 1=1 
-                    <if test="albumName != null and albumName != ''">
-                         and album_name_ = #{albumName}
-                    </if>
-                    <if test="albumDesc != null and albumDesc != ''">
-                         and album_desc_ = #{albumDesc}
-                    </if>
-                    <if test="albumTag != null and albumTag != ''">
-                         and album_tag_ = #{albumTag}
-                    </if>
-                    <if test="albumCoverUrl != null and albumCoverUrl != ''">
-                         and album_cover_url_ = #{albumCoverUrl}
-                    </if>
-                    <if test="albumStatus != null">
-                         and album_status_ = #{albumStatus}
-                    </if>
-                    <if test="sortNumber != null">
-                         and sort_number_ = #{sortNumber}
-                    </if>
-                    <if test="hotFlag != null">
-                         and hot_flag_ = #{hotFlag}
-                    </if>
-                    <if test="topFlag != null">
-                         and top_flag_ = #{topFlag}
-                    </if>
-                    <if test="createTime != null">
-                         and create_time_ = #{createTime}
-                    </if>
-                    <if test="createBy != null">
-                         and create_by_ = #{createBy}
-                    </if>
-                    <if test="updateTime != null">
-                         and update_time_ = #{updateTime}
-                    </if>
-                    <if test="updateBy != null">
-                         and update_by_ = #{updateBy}
-                    </if>
-	</select>
 
 </mapper>

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

@@ -15,83 +15,6 @@
 		id_, user_id_, music_sheet_id_, favorite_time_, favorite_flag_
 	</sql>
 
-	<select id="get" parameterType="Long" resultMap="BaseResultMap">
-		 select
-		 <include refid="Base_Column_List" />
-		 from music_favorite
-		 where id_ = #{id}
-	</select>
 
-	<delete id="delete" parameterType="Long">
-		 delete from music_favorite
-		 where id_ = #{id}
-	</delete>
-	
-	<delete id="delete" parameterType="com.yonge.cooleshow.biz.dal.entity.MusicFavorite">
-		 delete from music_favorite
-		 where 1=1
-		 	<if test="userId != null and userId != ''">
-				 and user_id_ = #{userId}
-			</if>
-		 	<if test="musicSheetId != null and musicSheetId != ''">
-				 and music_sheet_id_ = #{musicSheetId}
-			</if>
-		 	<if test="favoriteTime != null and favoriteTime != ''">
-				 and favorite_time_ = #{favoriteTime}
-			</if>
-		 	<if test="favoriteFlag != null and favoriteFlag != ''">
-				 and favorite_flag_ = #{favoriteFlag}
-			</if>
-	</delete>
-	
-	<insert id="insert" parameterType="com.yonge.cooleshow.biz.dal.entity.MusicFavorite">
-		 insert into music_favorite
- 		 (user_id_,music_sheet_id_,favorite_time_,favorite_flag_)
-		 values 
- 		 (#{userId},#{musicSheetId},#{favoriteTime},#{favoriteFlag})
-	</insert>
-	
-	<update id="update" parameterType="com.yonge.cooleshow.biz.dal.entity.MusicFavorite">
-		 update music_favorite
- 		 <set>
-		 	   		<if test="userId != null">
-		 	   			 user_id_ = #{userId},
-					</if>
-		 	   		<if test="musicSheetId != null">
-		 	   			 music_sheet_id_ = #{musicSheetId},
-					</if>
-		 	   		<if test="favoriteTime != null">
-		 	   			 favorite_time_ = #{favoriteTime},
-					</if>
-		 	   		<if test="favoriteFlag != null">
-		 	   			 favorite_flag_ = #{favoriteFlag},
-					</if>
- 		 </set>
-		 where id_ = #{id}
-	</update>
-
-	<select id="findAll" resultMap="BaseResultMap">
-        SELECT * FROM music_favorite
-        ORDER BY id_ desc
-    </select>
-
-	<select id="findList" parameterType="com.yonge.cooleshow.biz.dal.entity.MusicFavorite" resultMap="BaseResultMap">
-		 select
-		 <include refid="Base_Column_List" />
-		 from music_favorite
-		 where 1=1 
-                    <if test="userId != null">
-                         and user_id_ = #{userId}
-                    </if>
-                    <if test="musicSheetId != null">
-                         and music_sheet_id_ = #{musicSheetId}
-                    </if>
-                    <if test="favoriteTime != null">
-                         and favorite_time_ = #{favoriteTime}
-                    </if>
-                    <if test="favoriteFlag != null">
-                         and favorite_flag_ = #{favoriteFlag}
-                    </if>
-	</select>
 
 </mapper>

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

@@ -17,101 +17,6 @@
 		id_, music_sheet_id_, music_subject_, audio_file_url_, sort_number_, create_time_, create_by_
 	</sql>
 
-	<select id="get" parameterType="Long" resultMap="BaseResultMap">
-		 select
-		 <include refid="Base_Column_List" />
-		 from music_sheet_accompaniment
-		 where id_ = #{id}
-	</select>
 
-	<delete id="delete" parameterType="Long">
-		 delete from music_sheet_accompaniment
-		 where id_ = #{id}
-	</delete>
-	
-	<delete id="delete" parameterType="com.yonge.cooleshow.biz.dal.entity.MusicSheetAccompaniment">
-		 delete from music_sheet_accompaniment
-		 where 1=1
-		 	<if test="musicSheetId != null and musicSheetId != ''">
-				 and music_sheet_id_ = #{musicSheetId}
-			</if>
-		 	<if test="musicSubject != null and musicSubject != ''">
-				 and music_subject_ = #{musicSubject}
-			</if>
-		 	<if test="audioFileUrl != null and audioFileUrl != ''">
-				 and audio_file_url_ = #{audioFileUrl}
-			</if>
-		 	<if test="sortNumber != null and sortNumber != ''">
-				 and sort_number_ = #{sortNumber}
-			</if>
-		 	<if test="createTime != null and createTime != ''">
-				 and create_time_ = #{createTime}
-			</if>
-		 	<if test="createBy != null and createBy != ''">
-				 and create_by_ = #{createBy}
-			</if>
-	</delete>
-	
-	<insert id="insert" parameterType="com.yonge.cooleshow.biz.dal.entity.MusicSheetAccompaniment">
-		 insert into music_sheet_accompaniment
- 		 (music_sheet_id_,music_subject_,audio_file_url_,sort_number_,create_time_,create_by_)
-		 values 
- 		 (#{musicSheetId},#{musicSubject},#{audioFileUrl},#{sortNumber},sysdate(),#{createBy})
-	</insert>
-	
-	<update id="update" parameterType="com.yonge.cooleshow.biz.dal.entity.MusicSheetAccompaniment">
-		 update music_sheet_accompaniment
- 		 <set>
-		 	   		<if test="musicSheetId != null">
-		 	   			 music_sheet_id_ = #{musicSheetId},
-					</if>
-				 	<if test="musicSubject != null and musicSubject != ''">
-						 music_subject_ = #{musicSubject},
-					</if>
-				 	<if test="audioFileUrl != null and audioFileUrl != ''">
-						 audio_file_url_ = #{audioFileUrl},
-					</if>
-		 	   		<if test="sortNumber != null">
-		 	   			 sort_number_ = #{sortNumber},
-					</if>
-		 	   		<if test="createTime != null">
-		 	   			 create_time_ = #{createTime},
-					</if>
-		 	   		<if test="createBy != null">
-		 	   			 create_by_ = #{createBy},
-					</if>
- 		 </set>
-		 where id_ = #{id}
-	</update>
-
-	<select id="findAll" resultMap="BaseResultMap">
-        SELECT * FROM music_sheet_accompaniment
-        ORDER BY id_ desc
-    </select>
-
-	<select id="findList" parameterType="com.yonge.cooleshow.biz.dal.entity.MusicSheetAccompaniment" resultMap="BaseResultMap">
-		 select
-		 <include refid="Base_Column_List" />
-		 from music_sheet_accompaniment
-		 where 1=1 
-                    <if test="musicSheetId != null">
-                         and music_sheet_id_ = #{musicSheetId}
-                    </if>
-                    <if test="musicSubject != null and musicSubject != ''">
-                         and music_subject_ = #{musicSubject}
-                    </if>
-                    <if test="audioFileUrl != null and audioFileUrl != ''">
-                         and audio_file_url_ = #{audioFileUrl}
-                    </if>
-                    <if test="sortNumber != null">
-                         and sort_number_ = #{sortNumber}
-                    </if>
-                    <if test="createTime != null">
-                         and create_time_ = #{createTime}
-                    </if>
-                    <if test="createBy != null">
-                         and create_by_ = #{createBy}
-                    </if>
-	</select>
 
 </mapper>

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

@@ -34,254 +34,6 @@
 		id_, music_sheet_name_, user_id_, composer_, music_subject_, audio_type_, music_tag_, play_speed_, can_evaluate_, show_fingering_, charge_type_, audit_status_, sort_number_, top_flag_, hot_flag_, music_price_, audio_file_url_, xml_file_url_, has_beat_, create_time_, create_by_, update_time_, update_by_, remark_
 	</sql>
 
-	<select id="get" parameterType="Long" resultMap="BaseResultMap">
-		 select
-		 <include refid="Base_Column_List" />
-		 from music_sheet
-		 where id_ = #{id}
-	</select>
 
-	<delete id="delete" parameterType="Long">
-		 delete from music_sheet
-		 where id_ = #{id}
-	</delete>
-	
-	<delete id="delete" parameterType="com.yonge.cooleshow.biz.dal.entity.MusicSheet">
-		 delete from music_sheet
-		 where 1=1
-		 	<if test="musicSheetName != null and musicSheetName != ''">
-				 and music_sheet_name_ = #{musicSheetName}
-			</if>
-		 	<if test="userId != null and userId != ''">
-				 and user_id_ = #{userId}
-			</if>
-		 	<if test="composer != null and composer != ''">
-				 and composer_ = #{composer}
-			</if>
-		 	<if test="musicSubject != null and musicSubject != ''">
-				 and music_subject_ = #{musicSubject}
-			</if>
-		 	<if test="audioType != null and audioType != ''">
-				 and audio_type_ = #{audioType}
-			</if>
-		 	<if test="musicTag != null and musicTag != ''">
-				 and music_tag_ = #{musicTag}
-			</if>
-		 	<if test="playSpeed != null and playSpeed != ''">
-				 and play_speed_ = #{playSpeed}
-			</if>
-		 	<if test="canEvaluate != null and canEvaluate != ''">
-				 and can_evaluate_ = #{canEvaluate}
-			</if>
-		 	<if test="showFingering != null and showFingering != ''">
-				 and show_fingering_ = #{showFingering}
-			</if>
-		 	<if test="chargeType != null and chargeType != ''">
-				 and charge_type_ = #{chargeType}
-			</if>
-		 	<if test="auditStatus != null and auditStatus != ''">
-				 and audit_status_ = #{auditStatus}
-			</if>
-		 	<if test="sortNumber != null and sortNumber != ''">
-				 and sort_number_ = #{sortNumber}
-			</if>
-		 	<if test="topFlag != null and topFlag != ''">
-				 and top_flag_ = #{topFlag}
-			</if>
-		 	<if test="hotFlag != null and hotFlag != ''">
-				 and hot_flag_ = #{hotFlag}
-			</if>
-		 	<if test="musicPrice != null and musicPrice != ''">
-				 and music_price_ = #{musicPrice}
-			</if>
-		 	<if test="audioFileUrl != null and audioFileUrl != ''">
-				 and audio_file_url_ = #{audioFileUrl}
-			</if>
-		 	<if test="xmlFileUrl != null and xmlFileUrl != ''">
-				 and xml_file_url_ = #{xmlFileUrl}
-			</if>
-		 	<if test="hasBeat != null and hasBeat != ''">
-				 and has_beat_ = #{hasBeat}
-			</if>
-		 	<if test="createTime != null and createTime != ''">
-				 and create_time_ = #{createTime}
-			</if>
-		 	<if test="createBy != null and createBy != ''">
-				 and create_by_ = #{createBy}
-			</if>
-		 	<if test="updateTime != null and updateTime != ''">
-				 and update_time_ = #{updateTime}
-			</if>
-		 	<if test="updateBy != null and updateBy != ''">
-				 and update_by_ = #{updateBy}
-			</if>
-		 	<if test="remark != null and remark != ''">
-				 and remark_ = #{remark}
-			</if>
-	</delete>
-	
-	<insert id="insert" parameterType="com.yonge.cooleshow.biz.dal.entity.MusicSheet">
-		 insert into music_sheet
- 		 (music_sheet_name_,user_id_,composer_,music_subject_,audio_type_,music_tag_,play_speed_,can_evaluate_,show_fingering_,charge_type_,audit_status_,sort_number_,top_flag_,hot_flag_,music_price_,audio_file_url_,xml_file_url_,has_beat_,create_time_,create_by_,update_time_,update_by_,remark_)
-		 values 
- 		 (#{musicSheetName},#{userId},#{composer},#{musicSubject},#{audioType},#{musicTag},#{playSpeed},#{canEvaluate},#{showFingering},#{chargeType},#{auditStatus},#{sortNumber},#{topFlag},#{hotFlag},#{musicPrice},#{audioFileUrl},#{xmlFileUrl},#{hasBeat},sysdate(),#{createBy},#{updateTime},#{updateBy},#{remark})
-	</insert>
-	
-	<update id="update" parameterType="com.yonge.cooleshow.biz.dal.entity.MusicSheet">
-		 update music_sheet
- 		 <set>
-				 	<if test="musicSheetName != null and musicSheetName != ''">
-						 music_sheet_name_ = #{musicSheetName},
-					</if>
-		 	   		<if test="userId != null">
-		 	   			 user_id_ = #{userId},
-					</if>
-				 	<if test="composer != null and composer != ''">
-						 composer_ = #{composer},
-					</if>
-				 	<if test="musicSubject != null and musicSubject != ''">
-						 music_subject_ = #{musicSubject},
-					</if>
-				 	<if test="audioType != null and audioType != ''">
-						 audio_type_ = #{audioType},
-					</if>
-				 	<if test="musicTag != null and musicTag != ''">
-						 music_tag_ = #{musicTag},
-					</if>
-		 	   		<if test="playSpeed != null">
-		 	   			 play_speed_ = #{playSpeed},
-					</if>
-		 	   		<if test="canEvaluate != null">
-		 	   			 can_evaluate_ = #{canEvaluate},
-					</if>
-		 	   		<if test="showFingering != null">
-		 	   			 show_fingering_ = #{showFingering},
-					</if>
-		 	   		<if test="chargeType != null">
-		 	   			 charge_type_ = #{chargeType},
-					</if>
-		 	   		<if test="auditStatus != null">
-		 	   			 audit_status_ = #{auditStatus},
-					</if>
-		 	   		<if test="sortNumber != null">
-		 	   			 sort_number_ = #{sortNumber},
-					</if>
-		 	   		<if test="topFlag != null">
-		 	   			 top_flag_ = #{topFlag},
-					</if>
-		 	   		<if test="hotFlag != null">
-		 	   			 hot_flag_ = #{hotFlag},
-					</if>
-		 	   		<if test="musicPrice != null">
-		 	   			 music_price_ = #{musicPrice},
-					</if>
-				 	<if test="audioFileUrl != null and audioFileUrl != ''">
-						 audio_file_url_ = #{audioFileUrl},
-					</if>
-				 	<if test="xmlFileUrl != null and xmlFileUrl != ''">
-						 xml_file_url_ = #{xmlFileUrl},
-					</if>
-		 	   		<if test="hasBeat != null">
-		 	   			 has_beat_ = #{hasBeat},
-					</if>
-		 	   		<if test="createTime != null">
-		 	   			 create_time_ = #{createTime},
-					</if>
-		 	   		<if test="createBy != null">
-		 	   			 create_by_ = #{createBy},
-					</if>
-		 	   		<if test="updateTime != null">
-		 	   			 update_time_ = #{updateTime},
-					</if>
-		 	   		<if test="updateBy != null">
-		 	   			 update_by_ = #{updateBy},
-					</if>
-				 	<if test="remark != null and remark != ''">
-						 remark_ = #{remark},
-					</if>
- 		 </set>
-		 where id_ = #{id}
-	</update>
-
-	<select id="findAll" resultMap="BaseResultMap">
-        SELECT * FROM music_sheet
-        ORDER BY id_ desc
-    </select>
-
-	<select id="findList" parameterType="com.yonge.cooleshow.biz.dal.entity.MusicSheet" resultMap="BaseResultMap">
-		 select
-		 <include refid="Base_Column_List" />
-		 from music_sheet
-		 where 1=1 
-                    <if test="musicSheetName != null and musicSheetName != ''">
-                         and music_sheet_name_ = #{musicSheetName}
-                    </if>
-                    <if test="userId != null">
-                         and user_id_ = #{userId}
-                    </if>
-                    <if test="composer != null and composer != ''">
-                         and composer_ = #{composer}
-                    </if>
-                    <if test="musicSubject != null and musicSubject != ''">
-                         and music_subject_ = #{musicSubject}
-                    </if>
-                    <if test="audioType != null and audioType != ''">
-                         and audio_type_ = #{audioType}
-                    </if>
-                    <if test="musicTag != null and musicTag != ''">
-                         and music_tag_ = #{musicTag}
-                    </if>
-                    <if test="playSpeed != null">
-                         and play_speed_ = #{playSpeed}
-                    </if>
-                    <if test="canEvaluate != null">
-                         and can_evaluate_ = #{canEvaluate}
-                    </if>
-                    <if test="showFingering != null">
-                         and show_fingering_ = #{showFingering}
-                    </if>
-                    <if test="chargeType != null">
-                         and charge_type_ = #{chargeType}
-                    </if>
-                    <if test="auditStatus != null">
-                         and audit_status_ = #{auditStatus}
-                    </if>
-                    <if test="sortNumber != null">
-                         and sort_number_ = #{sortNumber}
-                    </if>
-                    <if test="topFlag != null">
-                         and top_flag_ = #{topFlag}
-                    </if>
-                    <if test="hotFlag != null">
-                         and hot_flag_ = #{hotFlag}
-                    </if>
-                    <if test="musicPrice != null">
-                         and music_price_ = #{musicPrice}
-                    </if>
-                    <if test="audioFileUrl != null and audioFileUrl != ''">
-                         and audio_file_url_ = #{audioFileUrl}
-                    </if>
-                    <if test="xmlFileUrl != null and xmlFileUrl != ''">
-                         and xml_file_url_ = #{xmlFileUrl}
-                    </if>
-                    <if test="hasBeat != null">
-                         and has_beat_ = #{hasBeat}
-                    </if>
-                    <if test="createTime != null">
-                         and create_time_ = #{createTime}
-                    </if>
-                    <if test="createBy != null">
-                         and create_by_ = #{createBy}
-                    </if>
-                    <if test="updateTime != null">
-                         and update_time_ = #{updateTime}
-                    </if>
-                    <if test="updateBy != null">
-                         and update_by_ = #{updateBy}
-                    </if>
-                    <if test="remark != null and remark != ''">
-                         and remark_ = #{remark}
-                    </if>
-	</select>
 
 </mapper>

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

@@ -18,110 +18,6 @@
 		id_, music_sheet_id_, teacher_id_, order_no_, student_id_, purchase_time_, purchase_price_, order_status_
 	</sql>
 
-	<select id="get" parameterType="Long" resultMap="BaseResultMap">
-		 select
-		 <include refid="Base_Column_List" />
-		 from music_sheet_purchase_record
-		 where id_ = #{id}
-	</select>
 
-	<delete id="delete" parameterType="Long">
-		 delete from music_sheet_purchase_record
-		 where id_ = #{id}
-	</delete>
-	
-	<delete id="delete" parameterType="com.yonge.cooleshow.biz.dal.entity.MusicSheetPurchaseRecord">
-		 delete from music_sheet_purchase_record
-		 where 1=1
-		 	<if test="musicSheetId != null and musicSheetId != ''">
-				 and music_sheet_id_ = #{musicSheetId}
-			</if>
-		 	<if test="teacherId != null and teacherId != ''">
-				 and teacher_id_ = #{teacherId}
-			</if>
-		 	<if test="orderNo != null and orderNo != ''">
-				 and order_no_ = #{orderNo}
-			</if>
-		 	<if test="studentId != null and studentId != ''">
-				 and student_id_ = #{studentId}
-			</if>
-		 	<if test="purchaseTime != null and purchaseTime != ''">
-				 and purchase_time_ = #{purchaseTime}
-			</if>
-		 	<if test="purchasePrice != null and purchasePrice != ''">
-				 and purchase_price_ = #{purchasePrice}
-			</if>
-		 	<if test="orderStatus != null and orderStatus != ''">
-				 and order_status_ = #{orderStatus}
-			</if>
-	</delete>
-	
-	<insert id="insert" parameterType="com.yonge.cooleshow.biz.dal.entity.MusicSheetPurchaseRecord">
-		 insert into music_sheet_purchase_record
- 		 (music_sheet_id_,teacher_id_,order_no_,student_id_,purchase_time_,purchase_price_,order_status_)
-		 values 
- 		 (#{musicSheetId},#{teacherId},#{orderNo},#{studentId},#{purchaseTime},#{purchasePrice},#{orderStatus})
-	</insert>
-	
-	<update id="update" parameterType="com.yonge.cooleshow.biz.dal.entity.MusicSheetPurchaseRecord">
-		 update music_sheet_purchase_record
- 		 <set>
-		 	   		<if test="musicSheetId != null">
-		 	   			 music_sheet_id_ = #{musicSheetId},
-					</if>
-		 	   		<if test="teacherId != null">
-		 	   			 teacher_id_ = #{teacherId},
-					</if>
-				 	<if test="orderNo != null and orderNo != ''">
-						 order_no_ = #{orderNo},
-					</if>
-		 	   		<if test="studentId != null">
-		 	   			 student_id_ = #{studentId},
-					</if>
-		 	   		<if test="purchaseTime != null">
-		 	   			 purchase_time_ = #{purchaseTime},
-					</if>
-		 	   		<if test="purchasePrice != null">
-		 	   			 purchase_price_ = #{purchasePrice},
-					</if>
-		 	   		<if test="orderStatus != null">
-		 	   			 order_status_ = #{orderStatus},
-					</if>
- 		 </set>
-		 where id_ = #{id}
-	</update>
-
-	<select id="findAll" resultMap="BaseResultMap">
-        SELECT * FROM music_sheet_purchase_record
-        ORDER BY id_ desc
-    </select>
-
-	<select id="findList" parameterType="com.yonge.cooleshow.biz.dal.entity.MusicSheetPurchaseRecord" resultMap="BaseResultMap">
-		 select
-		 <include refid="Base_Column_List" />
-		 from music_sheet_purchase_record
-		 where 1=1 
-                    <if test="musicSheetId != null">
-                         and music_sheet_id_ = #{musicSheetId}
-                    </if>
-                    <if test="teacherId != null">
-                         and teacher_id_ = #{teacherId}
-                    </if>
-                    <if test="orderNo != null and orderNo != ''">
-                         and order_no_ = #{orderNo}
-                    </if>
-                    <if test="studentId != null">
-                         and student_id_ = #{studentId}
-                    </if>
-                    <if test="purchaseTime != null">
-                         and purchase_time_ = #{purchaseTime}
-                    </if>
-                    <if test="purchasePrice != null">
-                         and purchase_price_ = #{purchasePrice}
-                    </if>
-                    <if test="orderStatus != null">
-                         and order_status_ = #{orderStatus}
-                    </if>
-	</select>
 
 </mapper>

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

@@ -15,83 +15,6 @@
 		id_, video_id_, student_id_, content_, evaluate_time_
 	</sql>
 
-	<select id="get" parameterType="Long" resultMap="BaseResultMap">
-		 select
-		 <include refid="Base_Column_List" />
-		 from video_lesson_evaluate
-		 where id_ = #{id}
-	</select>
 
-	<delete id="delete" parameterType="Long">
-		 delete from video_lesson_evaluate
-		 where id_ = #{id}
-	</delete>
-	
-	<delete id="delete" parameterType="com.yonge.cooleshow.biz.dal.entity.VideoLessonEvaluate">
-		 delete from video_lesson_evaluate
-		 where 1=1
-		 	<if test="videoId != null and videoId != ''">
-				 and video_id_ = #{videoId}
-			</if>
-		 	<if test="studentId != null and studentId != ''">
-				 and student_id_ = #{studentId}
-			</if>
-		 	<if test="content != null and content != ''">
-				 and content_ = #{content}
-			</if>
-		 	<if test="evaluateTime != null and evaluateTime != ''">
-				 and evaluate_time_ = #{evaluateTime}
-			</if>
-	</delete>
-	
-	<insert id="insert" parameterType="com.yonge.cooleshow.biz.dal.entity.VideoLessonEvaluate">
-		 insert into video_lesson_evaluate
- 		 (video_id_,student_id_,content_,evaluate_time_)
-		 values 
- 		 (#{videoId},#{studentId},#{content},#{evaluateTime})
-	</insert>
-	
-	<update id="update" parameterType="com.yonge.cooleshow.biz.dal.entity.VideoLessonEvaluate">
-		 update video_lesson_evaluate
- 		 <set>
-		 	   		<if test="videoId != null">
-		 	   			 video_id_ = #{videoId},
-					</if>
-		 	   		<if test="studentId != null">
-		 	   			 student_id_ = #{studentId},
-					</if>
-				 	<if test="content != null and content != ''">
-						 content_ = #{content},
-					</if>
-		 	   		<if test="evaluateTime != null">
-		 	   			 evaluate_time_ = #{evaluateTime},
-					</if>
- 		 </set>
-		 where id_ = #{id}
-	</update>
-
-	<select id="findAll" resultMap="BaseResultMap">
-        SELECT * FROM video_lesson_evaluate
-        ORDER BY id_ desc
-    </select>
-
-	<select id="findList" parameterType="com.yonge.cooleshow.biz.dal.entity.VideoLessonEvaluate" resultMap="BaseResultMap">
-		 select
-		 <include refid="Base_Column_List" />
-		 from video_lesson_evaluate
-		 where 1=1 
-                    <if test="videoId != null">
-                         and video_id_ = #{videoId}
-                    </if>
-                    <if test="studentId != null">
-                         and student_id_ = #{studentId}
-                    </if>
-                    <if test="content != null and content != ''">
-                         and content_ = #{content}
-                    </if>
-                    <if test="evaluateTime != null">
-                         and evaluate_time_ = #{evaluateTime}
-                    </if>
-	</select>
 
 </mapper>

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

@@ -22,146 +22,6 @@
 		id_, video_lesson_group_id_, video_title_, video_content_, video_url_, cover_url_, charge_flag_, sort_number_, teacher_id_, create_time_, update_by_, update_time_
 	</sql>
 
-	<select id="get" parameterType="Long" resultMap="BaseResultMap">
-		 select
-		 <include refid="Base_Column_List" />
-		 from video_lesson_group_detail
-		 where id_ = #{id}
-	</select>
 
-	<delete id="delete" parameterType="Long">
-		 delete from video_lesson_group_detail
-		 where id_ = #{id}
-	</delete>
-	
-	<delete id="delete" parameterType="com.yonge.cooleshow.biz.dal.entity.VideoLessonGroupDetail">
-		 delete from video_lesson_group_detail
-		 where 1=1
-		 	<if test="videoLessonGroupId != null and videoLessonGroupId != ''">
-				 and video_lesson_group_id_ = #{videoLessonGroupId}
-			</if>
-		 	<if test="videoTitle != null and videoTitle != ''">
-				 and video_title_ = #{videoTitle}
-			</if>
-		 	<if test="videoContent != null and videoContent != ''">
-				 and video_content_ = #{videoContent}
-			</if>
-		 	<if test="videoUrl != null and videoUrl != ''">
-				 and video_url_ = #{videoUrl}
-			</if>
-		 	<if test="coverUrl != null and coverUrl != ''">
-				 and cover_url_ = #{coverUrl}
-			</if>
-		 	<if test="chargeFlag != null and chargeFlag != ''">
-				 and charge_flag_ = #{chargeFlag}
-			</if>
-		 	<if test="sortNumber != null and sortNumber != ''">
-				 and sort_number_ = #{sortNumber}
-			</if>
-		 	<if test="teacherId != null and teacherId != ''">
-				 and teacher_id_ = #{teacherId}
-			</if>
-		 	<if test="createTime != null and createTime != ''">
-				 and create_time_ = #{createTime}
-			</if>
-		 	<if test="updateBy != null and updateBy != ''">
-				 and update_by_ = #{updateBy}
-			</if>
-		 	<if test="updateTime != null and updateTime != ''">
-				 and update_time_ = #{updateTime}
-			</if>
-	</delete>
-	
-	<insert id="insert" parameterType="com.yonge.cooleshow.biz.dal.entity.VideoLessonGroupDetail">
-		 insert into video_lesson_group_detail
- 		 (video_lesson_group_id_,video_title_,video_content_,video_url_,cover_url_,charge_flag_,sort_number_,teacher_id_,create_time_,update_by_,update_time_)
-		 values 
- 		 (#{videoLessonGroupId},#{videoTitle},#{videoContent},#{videoUrl},#{coverUrl},#{chargeFlag},#{sortNumber},#{teacherId},sysdate(),#{updateBy},#{updateTime})
-	</insert>
-	
-	<update id="update" parameterType="com.yonge.cooleshow.biz.dal.entity.VideoLessonGroupDetail">
-		 update video_lesson_group_detail
- 		 <set>
-		 	   		<if test="videoLessonGroupId != null">
-		 	   			 video_lesson_group_id_ = #{videoLessonGroupId},
-					</if>
-				 	<if test="videoTitle != null and videoTitle != ''">
-						 video_title_ = #{videoTitle},
-					</if>
-				 	<if test="videoContent != null and videoContent != ''">
-						 video_content_ = #{videoContent},
-					</if>
-				 	<if test="videoUrl != null and videoUrl != ''">
-						 video_url_ = #{videoUrl},
-					</if>
-				 	<if test="coverUrl != null and coverUrl != ''">
-						 cover_url_ = #{coverUrl},
-					</if>
-		 	   		<if test="chargeFlag != null">
-		 	   			 charge_flag_ = #{chargeFlag},
-					</if>
-		 	   		<if test="sortNumber != null">
-		 	   			 sort_number_ = #{sortNumber},
-					</if>
-		 	   		<if test="teacherId != null">
-		 	   			 teacher_id_ = #{teacherId},
-					</if>
-		 	   		<if test="createTime != null">
-		 	   			 create_time_ = #{createTime},
-					</if>
-		 	   		<if test="updateBy != null">
-		 	   			 update_by_ = #{updateBy},
-					</if>
-		 	   		<if test="updateTime != null">
-		 	   			 update_time_ = #{updateTime},
-					</if>
- 		 </set>
-		 where id_ = #{id}
-	</update>
-
-	<select id="findAll" resultMap="BaseResultMap">
-        SELECT * FROM video_lesson_group_detail
-        ORDER BY id_ desc
-    </select>
-
-	<select id="findList" parameterType="com.yonge.cooleshow.biz.dal.entity.VideoLessonGroupDetail" resultMap="BaseResultMap">
-		 select
-		 <include refid="Base_Column_List" />
-		 from video_lesson_group_detail
-		 where 1=1 
-                    <if test="videoLessonGroupId != null">
-                         and video_lesson_group_id_ = #{videoLessonGroupId}
-                    </if>
-                    <if test="videoTitle != null and videoTitle != ''">
-                         and video_title_ = #{videoTitle}
-                    </if>
-                    <if test="videoContent != null and videoContent != ''">
-                         and video_content_ = #{videoContent}
-                    </if>
-                    <if test="videoUrl != null and videoUrl != ''">
-                         and video_url_ = #{videoUrl}
-                    </if>
-                    <if test="coverUrl != null and coverUrl != ''">
-                         and cover_url_ = #{coverUrl}
-                    </if>
-                    <if test="chargeFlag != null">
-                         and charge_flag_ = #{chargeFlag}
-                    </if>
-                    <if test="sortNumber != null">
-                         and sort_number_ = #{sortNumber}
-                    </if>
-                    <if test="teacherId != null">
-                         and teacher_id_ = #{teacherId}
-                    </if>
-                    <if test="createTime != null">
-                         and create_time_ = #{createTime}
-                    </if>
-                    <if test="updateBy != null">
-                         and update_by_ = #{updateBy}
-                    </if>
-                    <if test="updateTime != null">
-                         and update_time_ = #{updateTime}
-                    </if>
-	</select>
 
 </mapper>

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

@@ -25,173 +25,6 @@
 		id_, lesson_name_, lesson_subject_, lesson_desc_, lesson_price_, lesson_cover_url_, teacher_id_, lesson_count_, sort_number_, lesson_tag_, top_flag_, hot_flag_, audit_status_, create_time_, update_time_
 	</sql>
 
-	<select id="get" parameterType="Long" resultMap="BaseResultMap">
-		 select
-		 <include refid="Base_Column_List" />
-		 from video_lesson_group
-		 where id_ = #{id}
-	</select>
 
-	<delete id="delete" parameterType="Long">
-		 delete from video_lesson_group
-		 where id_ = #{id}
-	</delete>
-	
-	<delete id="delete" parameterType="com.yonge.cooleshow.biz.dal.entity.VideoLessonGroup">
-		 delete from video_lesson_group
-		 where 1=1
-		 	<if test="lessonName != null and lessonName != ''">
-				 and lesson_name_ = #{lessonName}
-			</if>
-		 	<if test="lessonSubject != null and lessonSubject != ''">
-				 and lesson_subject_ = #{lessonSubject}
-			</if>
-		 	<if test="lessonDesc != null and lessonDesc != ''">
-				 and lesson_desc_ = #{lessonDesc}
-			</if>
-		 	<if test="lessonPrice != null and lessonPrice != ''">
-				 and lesson_price_ = #{lessonPrice}
-			</if>
-		 	<if test="lessonCoverUrl != null and lessonCoverUrl != ''">
-				 and lesson_cover_url_ = #{lessonCoverUrl}
-			</if>
-		 	<if test="teacherId != null and teacherId != ''">
-				 and teacher_id_ = #{teacherId}
-			</if>
-		 	<if test="lessonCount != null and lessonCount != ''">
-				 and lesson_count_ = #{lessonCount}
-			</if>
-		 	<if test="sortNumber != null and sortNumber != ''">
-				 and sort_number_ = #{sortNumber}
-			</if>
-		 	<if test="lessonTag != null and lessonTag != ''">
-				 and lesson_tag_ = #{lessonTag}
-			</if>
-		 	<if test="topFlag != null and topFlag != ''">
-				 and top_flag_ = #{topFlag}
-			</if>
-		 	<if test="hotFlag != null and hotFlag != ''">
-				 and hot_flag_ = #{hotFlag}
-			</if>
-		 	<if test="auditStatus != null and auditStatus != ''">
-				 and audit_status_ = #{auditStatus}
-			</if>
-		 	<if test="createTime != null and createTime != ''">
-				 and create_time_ = #{createTime}
-			</if>
-		 	<if test="updateTime != null and updateTime != ''">
-				 and update_time_ = #{updateTime}
-			</if>
-	</delete>
-	
-	<insert id="insert" parameterType="com.yonge.cooleshow.biz.dal.entity.VideoLessonGroup">
-		 insert into video_lesson_group
- 		 (lesson_name_,lesson_subject_,lesson_desc_,lesson_price_,lesson_cover_url_,teacher_id_,lesson_count_,sort_number_,lesson_tag_,top_flag_,hot_flag_,audit_status_,create_time_,update_time_)
-		 values 
- 		 (#{lessonName},#{lessonSubject},#{lessonDesc},#{lessonPrice},#{lessonCoverUrl},#{teacherId},#{lessonCount},#{sortNumber},#{lessonTag},#{topFlag},#{hotFlag},#{auditStatus},sysdate(),#{updateTime})
-	</insert>
-	
-	<update id="update" parameterType="com.yonge.cooleshow.biz.dal.entity.VideoLessonGroup">
-		 update video_lesson_group
- 		 <set>
-				 	<if test="lessonName != null and lessonName != ''">
-						 lesson_name_ = #{lessonName},
-					</if>
-				 	<if test="lessonSubject != null and lessonSubject != ''">
-						 lesson_subject_ = #{lessonSubject},
-					</if>
-				 	<if test="lessonDesc != null and lessonDesc != ''">
-						 lesson_desc_ = #{lessonDesc},
-					</if>
-		 	   		<if test="lessonPrice != null">
-		 	   			 lesson_price_ = #{lessonPrice},
-					</if>
-				 	<if test="lessonCoverUrl != null and lessonCoverUrl != ''">
-						 lesson_cover_url_ = #{lessonCoverUrl},
-					</if>
-		 	   		<if test="teacherId != null">
-		 	   			 teacher_id_ = #{teacherId},
-					</if>
-		 	   		<if test="lessonCount != null">
-		 	   			 lesson_count_ = #{lessonCount},
-					</if>
-		 	   		<if test="sortNumber != null">
-		 	   			 sort_number_ = #{sortNumber},
-					</if>
-				 	<if test="lessonTag != null and lessonTag != ''">
-						 lesson_tag_ = #{lessonTag},
-					</if>
-		 	   		<if test="topFlag != null">
-		 	   			 top_flag_ = #{topFlag},
-					</if>
-		 	   		<if test="hotFlag != null">
-		 	   			 hot_flag_ = #{hotFlag},
-					</if>
-		 	   		<if test="auditStatus != null">
-		 	   			 audit_status_ = #{auditStatus},
-					</if>
-		 	   		<if test="createTime != null">
-		 	   			 create_time_ = #{createTime},
-					</if>
-		 	   		<if test="updateTime != null">
-		 	   			 update_time_ = #{updateTime},
-					</if>
- 		 </set>
-		 where id_ = #{id}
-	</update>
-
-	<select id="findAll" resultMap="BaseResultMap">
-        SELECT * FROM video_lesson_group
-        ORDER BY id_ desc
-    </select>
-
-	<select id="findList" parameterType="com.yonge.cooleshow.biz.dal.entity.VideoLessonGroup" resultMap="BaseResultMap">
-		 select
-		 <include refid="Base_Column_List" />
-		 from video_lesson_group
-		 where 1=1 
-                    <if test="lessonName != null and lessonName != ''">
-                         and lesson_name_ = #{lessonName}
-                    </if>
-                    <if test="lessonSubject != null and lessonSubject != ''">
-                         and lesson_subject_ = #{lessonSubject}
-                    </if>
-                    <if test="lessonDesc != null and lessonDesc != ''">
-                         and lesson_desc_ = #{lessonDesc}
-                    </if>
-                    <if test="lessonPrice != null">
-                         and lesson_price_ = #{lessonPrice}
-                    </if>
-                    <if test="lessonCoverUrl != null and lessonCoverUrl != ''">
-                         and lesson_cover_url_ = #{lessonCoverUrl}
-                    </if>
-                    <if test="teacherId != null">
-                         and teacher_id_ = #{teacherId}
-                    </if>
-                    <if test="lessonCount != null">
-                         and lesson_count_ = #{lessonCount}
-                    </if>
-                    <if test="sortNumber != null">
-                         and sort_number_ = #{sortNumber}
-                    </if>
-                    <if test="lessonTag != null and lessonTag != ''">
-                         and lesson_tag_ = #{lessonTag}
-                    </if>
-                    <if test="topFlag != null">
-                         and top_flag_ = #{topFlag}
-                    </if>
-                    <if test="hotFlag != null">
-                         and hot_flag_ = #{hotFlag}
-                    </if>
-                    <if test="auditStatus != null">
-                         and audit_status_ = #{auditStatus}
-                    </if>
-                    <if test="createTime != null">
-                         and create_time_ = #{createTime}
-                    </if>
-                    <if test="updateTime != null">
-                         and update_time_ = #{updateTime}
-                    </if>
-	</select>
 
 </mapper>

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

@@ -17,101 +17,6 @@
 		id_, video_lesson_group_id_, student_id_, purchase_time_, pay_money_, order_no_, order_status_
 	</sql>
 
-	<select id="get" parameterType="Long" resultMap="BaseResultMap">
-		 select
-		 <include refid="Base_Column_List" />
-		 from video_lesson_purchase_record
-		 where id_ = #{id}
-	</select>
 
-	<delete id="delete" parameterType="Long">
-		 delete from video_lesson_purchase_record
-		 where id_ = #{id}
-	</delete>
-	
-	<delete id="delete" parameterType="com.yonge.cooleshow.biz.dal.entity.VideoLessonPurchaseRecord">
-		 delete from video_lesson_purchase_record
-		 where 1=1
-		 	<if test="videoLessonGroupId != null and videoLessonGroupId != ''">
-				 and video_lesson_group_id_ = #{videoLessonGroupId}
-			</if>
-		 	<if test="studentId != null and studentId != ''">
-				 and student_id_ = #{studentId}
-			</if>
-		 	<if test="purchaseTime != null and purchaseTime != ''">
-				 and purchase_time_ = #{purchaseTime}
-			</if>
-		 	<if test="payMoney != null and payMoney != ''">
-				 and pay_money_ = #{payMoney}
-			</if>
-		 	<if test="orderNo != null and orderNo != ''">
-				 and order_no_ = #{orderNo}
-			</if>
-		 	<if test="orderStatus != null and orderStatus != ''">
-				 and order_status_ = #{orderStatus}
-			</if>
-	</delete>
-	
-	<insert id="insert" parameterType="com.yonge.cooleshow.biz.dal.entity.VideoLessonPurchaseRecord">
-		 insert into video_lesson_purchase_record
- 		 (video_lesson_group_id_,student_id_,purchase_time_,pay_money_,order_no_,order_status_)
-		 values 
- 		 (#{videoLessonGroupId},#{studentId},#{purchaseTime},#{payMoney},#{orderNo},#{orderStatus})
-	</insert>
-	
-	<update id="update" parameterType="com.yonge.cooleshow.biz.dal.entity.VideoLessonPurchaseRecord">
-		 update video_lesson_purchase_record
- 		 <set>
-		 	   		<if test="videoLessonGroupId != null">
-		 	   			 video_lesson_group_id_ = #{videoLessonGroupId},
-					</if>
-		 	   		<if test="studentId != null">
-		 	   			 student_id_ = #{studentId},
-					</if>
-		 	   		<if test="purchaseTime != null">
-		 	   			 purchase_time_ = #{purchaseTime},
-					</if>
-		 	   		<if test="payMoney != null">
-		 	   			 pay_money_ = #{payMoney},
-					</if>
-				 	<if test="orderNo != null and orderNo != ''">
-						 order_no_ = #{orderNo},
-					</if>
-		 	   		<if test="orderStatus != null">
-		 	   			 order_status_ = #{orderStatus},
-					</if>
- 		 </set>
-		 where id_ = #{id}
-	</update>
-
-	<select id="findAll" resultMap="BaseResultMap">
-        SELECT * FROM video_lesson_purchase_record
-        ORDER BY id_ desc
-    </select>
-
-	<select id="findList" parameterType="com.yonge.cooleshow.biz.dal.entity.VideoLessonPurchaseRecord" resultMap="BaseResultMap">
-		 select
-		 <include refid="Base_Column_List" />
-		 from video_lesson_purchase_record
-		 where 1=1 
-                    <if test="videoLessonGroupId != null">
-                         and video_lesson_group_id_ = #{videoLessonGroupId}
-                    </if>
-                    <if test="studentId != null">
-                         and student_id_ = #{studentId}
-                    </if>
-                    <if test="purchaseTime != null">
-                         and purchase_time_ = #{purchaseTime}
-                    </if>
-                    <if test="payMoney != null">
-                         and pay_money_ = #{payMoney}
-                    </if>
-                    <if test="orderNo != null and orderNo != ''">
-                         and order_no_ = #{orderNo}
-                    </if>
-                    <if test="orderStatus != null">
-                         and order_status_ = #{orderStatus}
-                    </if>
-	</select>
 
 </mapper>

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

@@ -17,101 +17,6 @@
 		id_, video_lesson_group_id_, video_id_, student_id_, finish_flag_, start_time_, finish_time_
 	</sql>
 
-	<select id="get" parameterType="Long" resultMap="BaseResultMap">
-		 select
-		 <include refid="Base_Column_List" />
-		 from video_lesson_study_record
-		 where id_ = #{id}
-	</select>
 
-	<delete id="delete" parameterType="Long">
-		 delete from video_lesson_study_record
-		 where id_ = #{id}
-	</delete>
-	
-	<delete id="delete" parameterType="com.yonge.cooleshow.biz.dal.entity.VideoLessonStudyRecord">
-		 delete from video_lesson_study_record
-		 where 1=1
-		 	<if test="videoLessonGroupId != null and videoLessonGroupId != ''">
-				 and video_lesson_group_id_ = #{videoLessonGroupId}
-			</if>
-		 	<if test="videoId != null and videoId != ''">
-				 and video_id_ = #{videoId}
-			</if>
-		 	<if test="studentId != null and studentId != ''">
-				 and student_id_ = #{studentId}
-			</if>
-		 	<if test="finishFlag != null and finishFlag != ''">
-				 and finish_flag_ = #{finishFlag}
-			</if>
-		 	<if test="startTime != null and startTime != ''">
-				 and start_time_ = #{startTime}
-			</if>
-		 	<if test="finishTime != null and finishTime != ''">
-				 and finish_time_ = #{finishTime}
-			</if>
-	</delete>
-	
-	<insert id="insert" parameterType="com.yonge.cooleshow.biz.dal.entity.VideoLessonStudyRecord">
-		 insert into video_lesson_study_record
- 		 (video_lesson_group_id_,video_id_,student_id_,finish_flag_,start_time_,finish_time_)
-		 values 
- 		 (#{videoLessonGroupId},#{videoId},#{studentId},#{finishFlag},#{startTime},#{finishTime})
-	</insert>
-	
-	<update id="update" parameterType="com.yonge.cooleshow.biz.dal.entity.VideoLessonStudyRecord">
-		 update video_lesson_study_record
- 		 <set>
-		 	   		<if test="videoLessonGroupId != null">
-		 	   			 video_lesson_group_id_ = #{videoLessonGroupId},
-					</if>
-		 	   		<if test="videoId != null">
-		 	   			 video_id_ = #{videoId},
-					</if>
-		 	   		<if test="studentId != null">
-		 	   			 student_id_ = #{studentId},
-					</if>
-		 	   		<if test="finishFlag != null">
-		 	   			 finish_flag_ = #{finishFlag},
-					</if>
-		 	   		<if test="startTime != null">
-		 	   			 start_time_ = #{startTime},
-					</if>
-		 	   		<if test="finishTime != null">
-		 	   			 finish_time_ = #{finishTime},
-					</if>
- 		 </set>
-		 where id_ = #{id}
-	</update>
-
-	<select id="findAll" resultMap="BaseResultMap">
-        SELECT * FROM video_lesson_study_record
-        ORDER BY id_ desc
-    </select>
-
-	<select id="findList" parameterType="com.yonge.cooleshow.biz.dal.entity.VideoLessonStudyRecord" resultMap="BaseResultMap">
-		 select
-		 <include refid="Base_Column_List" />
-		 from video_lesson_study_record
-		 where 1=1 
-                    <if test="videoLessonGroupId != null">
-                         and video_lesson_group_id_ = #{videoLessonGroupId}
-                    </if>
-                    <if test="videoId != null">
-                         and video_id_ = #{videoId}
-                    </if>
-                    <if test="studentId != null">
-                         and student_id_ = #{studentId}
-                    </if>
-                    <if test="finishFlag != null">
-                         and finish_flag_ = #{finishFlag}
-                    </if>
-                    <if test="startTime != null">
-                         and start_time_ = #{startTime}
-                    </if>
-                    <if test="finishTime != null">
-                         and finish_time_ = #{finishTime}
-                    </if>
-	</select>
 
 </mapper>