分页返回参数统一

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

@@ -1,9 +1,8 @@
 package com.yonge.cooleshow.admin.controller;
 
-import java.util.List;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
-import com.yonge.cooleshow.biz.dal.support.Condition;
+import com.yonge.cooleshow.biz.dal.support.PageUtil;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.page.PageInfo;
@@ -42,8 +41,8 @@ public class CourseHomeworkController extends BaseController {
     @PostMapping("/page")
     @ApiOperation(value = "查询分页", notes = "传入courseHomeworkSearch")
     public HttpResponseResult<PageInfo<CourseHomeworkVo>> page(@RequestBody CourseHomeworkSearch query) {
-		IPage<CourseHomeworkVo> pages = courseHomeworkService.selectPage(Condition.getPage(query), query);
-        return succeed(Condition.pageInfo(pages));
+		IPage<CourseHomeworkVo> pages = courseHomeworkService.selectPage(PageUtil.getPage(query), query);
+        return succeed(PageUtil.pageInfo(pages));
 	}
     
     /**

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

@@ -1,9 +1,8 @@
 package com.yonge.cooleshow.admin.controller;
 
-import java.util.List;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
-import com.yonge.cooleshow.biz.dal.support.Condition;
+import com.yonge.cooleshow.biz.dal.support.PageUtil;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.page.PageInfo;
@@ -42,8 +41,8 @@ public class CourseScheduleRepliedController extends BaseController {
     @PostMapping("/page")
     @ApiOperation(value = "查询分页", notes = "传入courseScheduleRepliedSearch")
     public HttpResponseResult<PageInfo<CourseScheduleRepliedVo>> page(@RequestBody CourseScheduleRepliedSearch query) {
-		IPage<CourseScheduleRepliedVo> pages = courseScheduleRepliedService.selectPage(Condition.getPage(query), query);
-        return succeed(Condition.pageInfo(pages));
+		IPage<CourseScheduleRepliedVo> pages = courseScheduleRepliedService.selectPage(PageUtil.getPage(query), query);
+        return succeed(PageUtil.pageInfo(pages));
 	}
     
     /**

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

@@ -7,7 +7,7 @@ import javax.validation.Valid;
 import com.yonge.cooleshow.biz.dal.dto.search.MusicAlbumDetailSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.MusicAlbumSearch;
 import com.yonge.cooleshow.biz.dal.enums.StateEnum;
-import com.yonge.cooleshow.biz.dal.support.Condition;
+import com.yonge.cooleshow.biz.dal.support.PageUtil;
 import com.yonge.cooleshow.biz.dal.vo.AlbumDetailVo;
 import com.yonge.cooleshow.biz.dal.vo.MusicAlbumVo;
 import com.yonge.cooleshow.common.page.PageInfo;
@@ -92,8 +92,8 @@ public class MusicAlbumController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        IPage<MusicAlbumVo> iPage = musicAlbumService.selectPage(Condition.getPage(query),query);
-        return succeed(Condition.pageInfo(iPage));
+        IPage<MusicAlbumVo> iPage = musicAlbumService.selectPage(PageUtil.getPage(query),query);
+        return succeed(PageUtil.pageInfo(iPage));
     }
 
     /**
@@ -117,7 +117,7 @@ public class MusicAlbumController extends BaseController {
     public HttpResponseResult<AlbumDetailVo> detail(@Valid @RequestBody MusicAlbumDetailSearch query) {
 
         query.setType(2);
-        AlbumDetailVo albumDetailVo = musicAlbumService.detail(Condition.getPage(query),query);
+        AlbumDetailVo albumDetailVo = musicAlbumService.detail(PageUtil.getPage(query),query);
         return succeed(albumDetailVo);
     }
 
@@ -131,7 +131,7 @@ public class MusicAlbumController extends BaseController {
 
         query.setType(1);
         query.setState(StateEnum.ENABLE);
-        AlbumDetailVo albumDetailVo = musicAlbumService.detail(Condition.getPage(query),query);
+        AlbumDetailVo albumDetailVo = musicAlbumService.detail(PageUtil.getPage(query),query);
         return succeed(albumDetailVo);
     }
 

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

@@ -11,7 +11,7 @@ import com.yonge.cooleshow.biz.dal.enums.AuditEnum;
 import com.yonge.cooleshow.biz.dal.enums.ChargeTypeEnum;
 import com.yonge.cooleshow.biz.dal.enums.StateEnum;
 import com.yonge.cooleshow.biz.dal.service.MusicSheetService;
-import com.yonge.cooleshow.biz.dal.support.Condition;
+import com.yonge.cooleshow.biz.dal.support.PageUtil;
 import com.yonge.cooleshow.biz.dal.vo.MusicSheetVo;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
@@ -20,7 +20,6 @@ import com.yonge.toolset.utils.string.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import jodd.util.CollectionUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
@@ -126,8 +125,8 @@ public class MusicSheetController extends BaseController {
             return failed("用户信息获取失败");
         }
 
-        IPage<MusicSheetVo> musicSheetVoIPage = musicSheetService.selectPage(Condition.getPage(query), query);
-        return succeed(Condition.pageInfo(musicSheetVoIPage));
+        IPage<MusicSheetVo> musicSheetVoIPage = musicSheetService.selectPage(PageUtil.getPage(query), query);
+        return succeed(PageUtil.pageInfo(musicSheetVoIPage));
     }
 
 

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

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.biz.dal.dto.MusicTagSaveDto;
 import com.yonge.cooleshow.biz.dal.dto.search.MusicTagSearch;
 import com.yonge.cooleshow.biz.dal.service.MusicTagService;
-import com.yonge.cooleshow.biz.dal.support.Condition;
+import com.yonge.cooleshow.biz.dal.support.PageUtil;
 import com.yonge.cooleshow.biz.dal.vo.MusicTagVo;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
@@ -42,8 +42,8 @@ public class MusicTagController extends BaseController {
     @GetMapping("/page")
     @ApiOperation(value = "查询分页", notes = "传入musicTag")
     public HttpResponseResult<PageInfo<MusicTagVo>> page(MusicTagSearch query) {
-		IPage<MusicTagVo> pages = musicTagService.selectPage(Condition.getPage(query), query);
-		return succeed(Condition.pageInfo(pages));
+		IPage<MusicTagVo> pages = musicTagService.selectPage(PageUtil.getPage(query), query);
+		return succeed(PageUtil.pageInfo(pages));
 	}
 
 

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

@@ -2,7 +2,7 @@ package com.yonge.cooleshow.admin.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
-import com.yonge.cooleshow.biz.dal.support.Condition;
+import com.yonge.cooleshow.biz.dal.support.PageUtil;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.page.PageInfo;
@@ -41,8 +41,8 @@ public class StudentAttendanceController extends BaseController {
     @PostMapping("/page")
     @ApiOperation(value = "查询分页", notes = "传入studentAttendanceSearch")
     public HttpResponseResult<PageInfo<StudentAttendanceVo>> page(@RequestBody StudentAttendanceSearch query) {
-		IPage<StudentAttendanceVo> pages = studentAttendanceService.selectPage(Condition.getPage(query), query);
-        return succeed(Condition.pageInfo(pages));
+		IPage<StudentAttendanceVo> pages = studentAttendanceService.selectPage(PageUtil.getPage(query), query);
+        return succeed(PageUtil.pageInfo(pages));
 	}
     
     /**

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

@@ -3,7 +3,7 @@ package com.yonge.cooleshow.admin.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.biz.dal.dto.search.StudentSearch;
 import com.yonge.cooleshow.biz.dal.service.StudentService;
-import com.yonge.cooleshow.biz.dal.support.Condition;
+import com.yonge.cooleshow.biz.dal.support.PageUtil;
 import com.yonge.cooleshow.biz.dal.vo.StudentVo;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
@@ -37,8 +37,8 @@ public class StudentController extends BaseController {
     @PostMapping("/page")
     @ApiOperation(value = "查询分页", notes = "传入student")
     public HttpResponseResult<PageInfo<StudentVo>> page(@RequestBody StudentSearch query) {
-		IPage<StudentVo> pages = studentService.selectPage(Condition.getPage(query), query);
-        return succeed(Condition.pageInfo(pages));
+		IPage<StudentVo> pages = studentService.selectPage(PageUtil.getPage(query), query);
+        return succeed(PageUtil.pageInfo(pages));
 	}
 
 }

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

@@ -2,7 +2,7 @@ package com.yonge.cooleshow.admin.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
-import com.yonge.cooleshow.biz.dal.support.Condition;
+import com.yonge.cooleshow.biz.dal.support.PageUtil;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.page.PageInfo;
@@ -41,8 +41,8 @@ public class StudentCourseHomeworkController extends BaseController {
     @PostMapping("/page")
     @ApiOperation(value = "查询分页", notes = "传入studentCourseHomeworkSearch")
     public HttpResponseResult<PageInfo<StudentCourseHomeworkVo>> page(@RequestBody StudentCourseHomeworkSearch query) {
-		IPage<StudentCourseHomeworkVo> pages = studentCourseHomeworkService.selectPage(Condition.getPage(query), query);
-        return succeed(Condition.pageInfo(pages));
+		IPage<StudentCourseHomeworkVo> pages = studentCourseHomeworkService.selectPage(PageUtil.getPage(query), query);
+        return succeed(PageUtil.pageInfo(pages));
 	}
     
     /**

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

@@ -6,8 +6,7 @@ import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dto.req.AuthOperaReq;
 import com.yonge.cooleshow.biz.dal.dto.search.AuthEntryRecordSearch;
 import com.yonge.cooleshow.biz.dal.service.TeacherAuthEntryRecordService;
-import com.yonge.cooleshow.biz.dal.support.Condition;
-import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.biz.dal.support.PageUtil;
 import com.yonge.cooleshow.biz.dal.vo.TeacherAuthEntryRecordVo;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
@@ -47,8 +46,8 @@ public class TeacherAuthEntryRecordController extends BaseController {
     @PostMapping("/page")
     @ApiOperation(value = "查询分页", notes = "传入teacherAuthEntryRecord")
     public HttpResponseResult<PageInfo<TeacherAuthEntryRecordVo>> page(@RequestBody AuthEntryRecordSearch search) {
-        IPage<TeacherAuthEntryRecordVo> pages = teacherAuthEntryRecordService.selectPage(Condition.getPage(search), search);
-        return succeed(Condition.pageInfo(pages));
+        IPage<TeacherAuthEntryRecordVo> pages = teacherAuthEntryRecordService.selectPage(PageUtil.getPage(search), search);
+        return succeed(PageUtil.pageInfo(pages));
     }
 
     @PostMapping("/doAuth")

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

@@ -5,12 +5,9 @@ import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dto.req.AuthOperaReq;
 import com.yonge.cooleshow.biz.dal.dto.search.AuthEntryRecordSearch;
-import com.yonge.cooleshow.biz.dal.entity.TeacherAuthMusicianRecord;
 import com.yonge.cooleshow.biz.dal.service.TeacherAuthMusicianRecordService;
-import com.yonge.cooleshow.biz.dal.support.Condition;
-import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.biz.dal.support.PageUtil;
 import com.yonge.cooleshow.biz.dal.vo.MusicianAuthEntryRecordVo;
-import com.yonge.cooleshow.biz.dal.vo.TeacherAuthEntryRecordVo;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.page.PageInfo;
@@ -20,7 +17,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
-import java.util.List;
 
 @RestController
 @RequestMapping("/teacherAuthMusicianRecord")
@@ -51,8 +47,8 @@ public class TeacherAuthMusicianRecordController extends BaseController {
 	@PostMapping("/page")
 	@ApiOperation(value = "查询分页", notes = "传入AuthEntryRecordSearch")
 	public HttpResponseResult<PageInfo<MusicianAuthEntryRecordVo>> page(@RequestBody AuthEntryRecordSearch query) {
-		IPage<MusicianAuthEntryRecordVo> pages = teacherAuthMusicianRecordService.selectPage(Condition.getPage(query), query);
-		return succeed(Condition.pageInfo(pages));
+		IPage<MusicianAuthEntryRecordVo> pages = teacherAuthMusicianRecordService.selectPage(PageUtil.getPage(query), query);
+		return succeed(PageUtil.pageInfo(pages));
 	}
 
 	@PostMapping("/doAuth")

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

@@ -1,27 +1,22 @@
 package com.yonge.cooleshow.admin.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
-import com.yonge.cooleshow.auth.api.entity.SysUser;
-import com.yonge.cooleshow.biz.dal.dao.SubjectDao;
-import com.yonge.cooleshow.biz.dal.dto.req.TeacherSubmitReq;
-import com.yonge.cooleshow.biz.dal.dto.search.TeacherSearch;
-import com.yonge.cooleshow.biz.dal.entity.Teacher;
-import com.yonge.cooleshow.biz.dal.service.TeacherService;
-import com.yonge.cooleshow.biz.dal.support.Condition;
-import com.yonge.cooleshow.biz.dal.support.Query;
-import com.yonge.cooleshow.biz.dal.vo.TeacherHomeVo;
-import com.yonge.cooleshow.biz.dal.vo.TeacherVo;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.cooleshow.common.page.PageInfo;
+import com.yonge.cooleshow.biz.dal.support.PageUtil;
+
 import com.yonge.toolset.utils.string.StringUtil;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
-import java.util.List;
+
+import com.yonge.cooleshow.biz.dal.dto.req.TeacherSubmitReq;
+import com.yonge.cooleshow.biz.dal.dto.search.TeacherSearch;
+import com.yonge.cooleshow.biz.dal.service.TeacherService;
+import com.yonge.cooleshow.biz.dal.vo.TeacherVo;
 
 @RestController
 @RequestMapping("/teacher")
@@ -49,9 +44,9 @@ public class TeacherController extends BaseController {
      */
     @PostMapping("/page")
     @ApiOperation(value = "查询分页", notes = "传入teacher")
-    public HttpResponseResult<IPage<TeacherVo>> page(@RequestBody TeacherSearch query) {
-        IPage<TeacherVo> pages = teacherService.selectPage(Condition.getPage(query), query);
-        return succeed(pages);
+    public HttpResponseResult<PageInfo<TeacherVo>> page(@RequestBody TeacherSearch query) {
+        IPage<TeacherVo> pages = teacherService.selectPage(PageUtil.getPage(query), query);
+        return succeed(PageUtil.pageInfo(pages));
     }
 
     /**
@@ -59,7 +54,7 @@ public class TeacherController extends BaseController {
      */
     @PostMapping("/submit")
     @ApiOperation(value = "新增或修改", notes = "传入teacher")
-    public HttpResponseResult<Boolean> submit(@RequestBody TeacherSubmitReq teacherSubmitReq) {
+    public HttpResponseResult<Boolean> submit(@Valid @RequestBody TeacherSubmitReq teacherSubmitReq) {
         return teacherService.submit(teacherSubmitReq);
     }
 

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

@@ -2,7 +2,7 @@ package com.yonge.cooleshow.admin.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
-import com.yonge.cooleshow.biz.dal.support.Condition;
+import com.yonge.cooleshow.biz.dal.support.PageUtil;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.page.PageInfo;
@@ -41,8 +41,8 @@ public class TeacherWithdrawalController extends BaseController {
     @PostMapping("/page")
     @ApiOperation(value = "查询分页", notes = "传入teacherWithdrawalSearch")
     public HttpResponseResult<PageInfo<TeacherWithdrawalVo>> page(@RequestBody TeacherWithdrawalSearch query) {
-		IPage<TeacherWithdrawalVo> pages = teacherWithdrawalService.selectPage(Condition.getPage(query), query);
-        return succeed(Condition.pageInfo(pages));
+		IPage<TeacherWithdrawalVo> pages = teacherWithdrawalService.selectPage(PageUtil.getPage(query), query);
+        return succeed(PageUtil.pageInfo(pages));
 	}
     
     /**

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

@@ -2,7 +2,7 @@ package com.yonge.cooleshow.admin.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
-import com.yonge.cooleshow.biz.dal.support.Condition;
+import com.yonge.cooleshow.biz.dal.support.PageUtil;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.page.PageInfo;
@@ -41,8 +41,8 @@ public class UserAccountController extends BaseController {
     @PostMapping("/page")
     @ApiOperation(value = "查询分页", notes = "传入userAccountSearch")
     public HttpResponseResult<PageInfo<UserAccountVo>> page(@RequestBody UserAccountSearch query) {
-		IPage<UserAccountVo> pages = userAccountService.selectPage(Condition.getPage(query), query);
-        return succeed(Condition.pageInfo(pages));
+		IPage<UserAccountVo> pages = userAccountService.selectPage(PageUtil.getPage(query), query);
+        return succeed(PageUtil.pageInfo(pages));
 	}
     
     /**

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

@@ -2,7 +2,7 @@ package com.yonge.cooleshow.admin.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
-import com.yonge.cooleshow.biz.dal.support.Condition;
+import com.yonge.cooleshow.biz.dal.support.PageUtil;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.page.PageInfo;
@@ -41,8 +41,8 @@ public class UserAccountRecordController extends BaseController {
     @PostMapping("/page")
     @ApiOperation(value = "查询分页", notes = "传入userAccountRecordSearch")
     public HttpResponseResult<PageInfo<UserAccountRecordVo>> page(@RequestBody UserAccountRecordSearch query) {
-		IPage<UserAccountRecordVo> pages = userAccountRecordService.selectPage(Condition.getPage(query), query);
-        return succeed(Condition.pageInfo(pages));
+		IPage<UserAccountRecordVo> pages = userAccountRecordService.selectPage(PageUtil.getPage(query), query);
+        return succeed(PageUtil.pageInfo(pages));
 	}
     
     /**

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

@@ -2,7 +2,7 @@ package com.yonge.cooleshow.admin.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
-import com.yonge.cooleshow.biz.dal.support.Condition;
+import com.yonge.cooleshow.biz.dal.support.PageUtil;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.page.PageInfo;
@@ -41,8 +41,8 @@ public class UserBankCardController extends BaseController {
     @PostMapping("/page")
     @ApiOperation(value = "查询分页", notes = "传入userBankCardSearch")
     public HttpResponseResult<PageInfo<UserBankCardVo>> page(@RequestBody UserBankCardSearch query) {
-		IPage<UserBankCardVo> pages = userBankCardService.selectPage(Condition.getPage(query), query);
-        return succeed(Condition.pageInfo(pages));
+		IPage<UserBankCardVo> pages = userBankCardService.selectPage(PageUtil.getPage(query), query);
+        return succeed(PageUtil.pageInfo(pages));
 	}
     
     /**

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

@@ -2,7 +2,7 @@ package com.yonge.cooleshow.admin.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
-import com.yonge.cooleshow.biz.dal.support.Condition;
+import com.yonge.cooleshow.biz.dal.support.PageUtil;
 import com.yonge.cooleshow.biz.dal.vo.UserOrderVo;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
@@ -41,8 +41,8 @@ public class UserOrderController extends BaseController {
     @PostMapping("/page")
     @ApiOperation(value = "查询分页", notes = "传入orderSearch")
     public HttpResponseResult<PageInfo<UserOrderVo>> page(@RequestBody OrderSearch query) {
-		IPage<UserOrderVo> pages = userOrderService.selectPage(Condition.getPage(query), query);
-        return succeed(Condition.pageInfo(pages));
+		IPage<UserOrderVo> pages = userOrderService.selectPage(PageUtil.getPage(query), query);
+        return succeed(PageUtil.pageInfo(pages));
 	}
     
     /**

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

@@ -2,7 +2,7 @@ package com.yonge.cooleshow.admin.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
-import com.yonge.cooleshow.biz.dal.support.Condition;
+import com.yonge.cooleshow.biz.dal.support.PageUtil;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.page.PageInfo;
@@ -41,8 +41,8 @@ public class UserOrderRefundsController extends BaseController {
     @PostMapping("/page")
     @ApiOperation(value = "查询分页", notes = "传入orderRefundsSearch")
     public HttpResponseResult<PageInfo<UserOrderRefundsVo>> page(@RequestBody OrderRefundsSearch query) {
-		IPage<UserOrderRefundsVo> pages = userOrderRefundsService.selectPage(Condition.getPage(query), query);
-        return succeed(Condition.pageInfo(pages));
+		IPage<UserOrderRefundsVo> pages = userOrderRefundsService.selectPage(PageUtil.getPage(query), query);
+        return succeed(PageUtil.pageInfo(pages));
 	}
     
     /**

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

@@ -2,7 +2,7 @@ package com.yonge.cooleshow.admin.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
-import com.yonge.cooleshow.biz.dal.support.Condition;
+import com.yonge.cooleshow.biz.dal.support.PageUtil;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.page.PageInfo;
@@ -41,8 +41,8 @@ public class VipCardRecordController extends BaseController {
     @PostMapping("/page")
     @ApiOperation(value = "查询分页", notes = "传入vipCardRecordSearch")
     public HttpResponseResult<PageInfo<VipCardRecordVo>> page(@RequestBody VipCardRecordSearch query) {
-		IPage<VipCardRecordVo> pages = vipCardRecordService.selectPage(Condition.getPage(query), query);
-        return succeed(Condition.pageInfo(pages));
+		IPage<VipCardRecordVo> pages = vipCardRecordService.selectPage(PageUtil.getPage(query), query);
+        return succeed(PageUtil.pageInfo(pages));
 	}
     
     /**

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

@@ -15,18 +15,6 @@ public class TeacherSearch extends Query {
     private String search;
     @ApiModelProperty(value = "老师类型 TOURIST 游客 ENTRY 认证老师 MUSICIAN 平台音乐人")
     private String teacherType;
-    /***
-     * 是否入驻老师
-     * @author liweifan
-     * @updateTime 2022/4/1 17:20
-     */
-    private YesOrNoEnum entryFlag;
-    /***
-     * 是否音乐人
-     * @author liweifan
-     * @updateTime 2022/4/1 17:20
-     */
-    private YesOrNoEnum musicianFlag;
 
     public String getSearch() {
         return search;
@@ -43,20 +31,4 @@ public class TeacherSearch extends Query {
     public void setTeacherType(String teacherType) {
         this.teacherType = teacherType;
     }
-
-    public YesOrNoEnum getEntryFlag() {
-        return entryFlag;
-    }
-
-    public void setEntryFlag(YesOrNoEnum entryFlag) {
-        this.entryFlag = entryFlag;
-    }
-
-    public YesOrNoEnum getMusicianFlag() {
-        return musicianFlag;
-    }
-
-    public void setMusicianFlag(YesOrNoEnum musicianFlag) {
-        this.musicianFlag = musicianFlag;
-    }
 }

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

@@ -7,13 +7,11 @@ import com.yonge.cooleshow.biz.dal.dto.search.MusicAlbumSearch;
 import com.yonge.cooleshow.biz.dal.entity.MusicAlbum;
 import com.yonge.cooleshow.biz.dal.dao.MusicAlbumDao;
 import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
-import com.yonge.cooleshow.biz.dal.entity.MusicTag;
 import com.yonge.cooleshow.biz.dal.enums.StateEnum;
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.biz.dal.service.AlbumMusicRelateService;
 import com.yonge.cooleshow.biz.dal.service.MusicAlbumService;
 import com.yonge.cooleshow.biz.dal.service.MusicSheetService;
-import com.yonge.cooleshow.biz.dal.support.Condition;
+import com.yonge.cooleshow.biz.dal.support.PageUtil;
 import com.yonge.cooleshow.biz.dal.vo.AlbumDetailVo;
 import com.yonge.cooleshow.biz.dal.vo.MusicAlbumVo;
 import com.yonge.cooleshow.common.exception.BizException;
@@ -80,7 +78,7 @@ public class MusicAlbumServiceImpl extends ServiceImpl<MusicAlbumDao,MusicAlbum>
         albumDetailVo.setAlbumName(musicAlbum.getAlbumName());
 
         IPage<MusicSheet> musicSheetVoIPage = musicSheetService.selectAlbumDetailPage(page,query);
-        albumDetailVo.setMusicSheetList(Condition.pageInfo(musicSheetVoIPage));
+        albumDetailVo.setMusicSheetList(PageUtil.pageInfo(musicSheetVoIPage));
         return albumDetailVo;
     }
 

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

@@ -75,11 +75,8 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
     }
 
     @Override
-    public IPage<TeacherVo> selectPage(IPage<TeacherVo> page, TeacherSearch teacher) {
-        if(!StringUtil.isEmpty(teacher.getTeacherType())){
-
-        }
-        return page.setRecords(baseMapper.selectPage(page, teacher));
+    public IPage<TeacherVo> selectPage(IPage<TeacherVo> page, TeacherSearch search) {
+        return page.setRecords(baseMapper.selectPage(page, search));
     }
 
     @Override

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

@@ -1,86 +0,0 @@
-package com.yonge.cooleshow.biz.dal.support;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yonge.cooleshow.common.page.PageInfo;
-import com.yonge.toolset.utils.string.StringUtil;
-import org.springframework.beans.BeanUtils;
-
-import java.util.Map;
-import java.util.Objects;
-
-/**
- * 分页工具
- *
- * @author Chill
- */
-public class Condition {
-	private static Integer toInt(Integer num,Integer bak){
-		if(null == num || 0 == num){
-			return bak;
-		}
-		return num;
-	}
-	/**
-	 * 转化成mybatis plus中的Page
-	 *
-	 * @param query 查询条件
-	 * @return IPage
-	 */
-	public static <T> IPage<T> getPage(Query query) {
-		Page<T> page = new Page<T>(toInt(query.getPage(),1), toInt(query.getRows(),10));
-		page.setAsc(StringUtil.toStrArray(SqlKeyword.filter(query.getAscs())));
-		page.setDesc(StringUtil.toStrArray(SqlKeyword.filter(query.getDescs())));
-		return page;
-	}
-
-	/**
-	 * 获取mybatis plus中的QueryWrapper
-	 *
-	 * @param entity 实体
-	 * @param <T>    类型
-	 * @return QueryWrapper
-	 */
-	public static <T> QueryWrapper<T> getQueryWrapper(T entity) {
-		return new QueryWrapper<>(entity);
-	}
-
-	/**
-	 * 获取mybatis plus中的QueryWrapper
-	 *
-	 * @param query   查询条件
-	 * @param exclude 排除的查询条件
-	 * @param clazz   实体类
-	 * @param <T>     类型
-	 * @return QueryWrapper
-	 */
-	public static <T> QueryWrapper<T> getQueryWrapper(Map<String, Object> query, Map<String, Object> exclude, Class<T> clazz) {
-		exclude.forEach((k, v) -> query.remove(k));
-		QueryWrapper<T> qw = new QueryWrapper<>();
-		qw.setEntity(BeanUtils.instantiateClass(clazz));
-		SqlKeyword.buildCondition(query, qw);
-		return qw;
-	}
-
-
-	/**
-	 * 将mybatisPlus的分页模型 转换为本项目的分页模型
-	 *
-	 * @param source  mybatisPlus的分页模型
-	 * @param <T>返回的类
-	 */
-	public static <T> PageInfo<T> pageInfo(IPage<T> source) {
-		if (Objects.isNull(source)) {
-			return new PageInfo<>(1, 20);
-		}
-		int total = Integer.parseInt(String.valueOf(source.getTotal()));
-		int limit = Integer.parseInt(String.valueOf(source.getSize()));
-		PageInfo<T> resultPage = new PageInfo<>();
-		resultPage.setRows(source.getRecords());
-		resultPage.setLimit(limit);
-		resultPage.setTotal(total);
-		return resultPage;
-	}
-
-}

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

@@ -1,8 +1,11 @@
 package com.yonge.cooleshow.biz.dal.support;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yonge.cooleshow.common.page.PageInfo;
+import com.yonge.toolset.utils.string.StringUtil;
+import org.springframework.beans.BeanUtils;
 
 import java.util.Map;
 import java.util.Objects;
@@ -14,6 +17,53 @@ import java.util.Optional;
  */
 public class PageUtil {
 
+    private static Integer toInt(Integer num,Integer bak){
+        if(null == num || 0 == num){
+            return bak;
+        }
+        return num;
+    }
+    /**
+     * 转化成mybatis plus中的Page
+     *
+     * @param query 查询条件
+     * @return IPage
+     */
+    public static <T> IPage<T> getPage(Query query) {
+        Page<T> page = new Page<T>(toInt(query.getPage(),1), toInt(query.getRows(),10));
+        page.setAsc(StringUtil.toStrArray(SqlKeyword.filter(query.getAscs())));
+        page.setDesc(StringUtil.toStrArray(SqlKeyword.filter(query.getDescs())));
+        return page;
+    }
+
+    /**
+     * 获取mybatis plus中的QueryWrapper
+     *
+     * @param entity 实体
+     * @param <T>    类型
+     * @return QueryWrapper
+     */
+    public static <T> QueryWrapper<T> getQueryWrapper(T entity) {
+        return new QueryWrapper<>(entity);
+    }
+
+    /**
+     * 获取mybatis plus中的QueryWrapper
+     *
+     * @param query   查询条件
+     * @param exclude 排除的查询条件
+     * @param clazz   实体类
+     * @param <T>     类型
+     * @return QueryWrapper
+     */
+    public static <T> QueryWrapper<T> getQueryWrapper(Map<String, Object> query, Map<String, Object> exclude, Class<T> clazz) {
+        exclude.forEach((k, v) -> query.remove(k));
+        QueryWrapper<T> qw = new QueryWrapper<>();
+        qw.setEntity(BeanUtils.instantiateClass(clazz));
+        SqlKeyword.buildCondition(query, qw);
+        return qw;
+    }
+
     /**
      * 获取mybatisPlus的分页模型
      *

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

@@ -68,6 +68,20 @@
                 u.phone_ LIKE CONCAT('%', #{param.search}, '%')
                 )
             </if>
+            <if test="null != param.teacherType and '' != param.teacherType">
+                and (
+                    1=0
+                    <if test='param.teacherType.contains("TOURIST")'>
+                        or (t.entry_flag_ = 0 and t.musician_flag_ = 0)
+                    </if>
+                    <if test='param.teacherType.contains("ENTRY")'>
+                        or t.entry_flag_ = 1
+                    </if>
+                    <if test='param.teacherType.contains("MUSICIAN")'>
+                        or t.musician_flag_ = 1
+                    </if>
+                )
+            </if>
         </where>
     </select>
 

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/StudentStarController.java

@@ -1,90 +0,0 @@
-package com.yonge.cooleshow.student.controller;
-
-import java.util.List;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-
-import com.yonge.cooleshow.biz.dal.support.Condition;
-import com.yonge.cooleshow.biz.dal.support.Query;
-import com.yonge.cooleshow.common.controller.BaseController;
-import com.yonge.cooleshow.common.entity.HttpResponseResult;
-import com.yonge.cooleshow.common.page.PageInfo;
-import com.yonge.toolset.utils.string.StringUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-
-import com.yonge.cooleshow.biz.dal.entity.StudentStar;
-import com.yonge.cooleshow.biz.dal.service.StudentStarService;
-
-@RestController
-@RequestMapping("/studentStar")
-@Api(value = "学生关注教师表", tags = "学生关注教师表")
-public class StudentStarController extends BaseController {
-
-    @Autowired
-    private StudentStarService studentStarService;
-
-	/**
-     * 查询单条
-     */
-    @GetMapping("/detail")
-    @ApiOperation(value = "详情", notes = "传入studentStar")
-    public HttpResponseResult<StudentStar> detail(StudentStar studentStar) {
-		StudentStar detail = studentStarService.getOne(Condition.getQueryWrapper(studentStar));
-		return succeed(detail);
-	}
-    
-    
-    /**
-     * 查询集合
-     */
-    @GetMapping("/list")
-    @ApiOperation(value = "查询集合", notes = "传入studentStar")
-    public HttpResponseResult<List<StudentStar>> list(StudentStar studentStar) {
-		List<StudentStar> list = studentStarService.list();
-		return succeed(list);
-	}
-
-    /**
-	 * 新增
-	 */
-	@PostMapping("/save")
-	@ApiOperation(value = "新增", notes = "传入studentStar")
-	public HttpResponseResult save(@Valid @RequestBody StudentStar studentStar) {
-    	return status(studentStarService.save(studentStar));
-	}
-    
-    /**
-	 * 修改
-	 */
-	@PostMapping("/update")
-	@ApiOperation(value = "修改", notes = "传入studentStar")
-	public HttpResponseResult update(@Valid @RequestBody StudentStar studentStar) {
-        return status(studentStarService.updateById(studentStar));
-	}
-    
-    /**
-	 * 新增或修改
-	 */
-    @PostMapping("/submit")
-    @ApiOperation(value = "新增或修改", notes = "传入studentStar")
-	public HttpResponseResult submit(@RequestBody StudentStar studentStar) {
-        return status(studentStarService.saveOrUpdate(studentStar));
-    }
-
- 	/**
-	 * 删除
-	 */
-	@PostMapping("/remove")
-	@ApiOperation(value = "逻辑删除", notes = "传入ids")
-	public HttpResponseResult remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-        if (StringUtil.isEmpty(ids)) {
-			return failed("参数不能为空");
-		}
-		return status(studentStarService.removeByIds(StringUtil.toLongList(ids)));
-	}
-}

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

@@ -2,7 +2,7 @@ package com.yonge.cooleshow.teacher.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.biz.dal.dto.search.VideoLessonGroupSearch;
-import com.yonge.cooleshow.biz.dal.support.Condition;
+import com.yonge.cooleshow.biz.dal.support.PageUtil;
 import com.yonge.cooleshow.biz.dal.vo.VideoLessonGroupUpVo;
 import com.yonge.cooleshow.biz.dal.vo.VideoLessonGroupVo;
 import com.yonge.cooleshow.common.page.PageInfo;
@@ -43,8 +43,8 @@ public class VideoLessonGroupController extends BaseController {
     @ApiOperation(value = "查询视频课组")
     @PostMapping(value = "/page")
     public HttpResponseResult<PageInfo<VideoLessonGroupVo>> page(@RequestBody VideoLessonGroupSearch query) {
-        IPage<VideoLessonGroupVo> pages = videoLessonGroupService.selectPage(Condition.getPage(query), query);
-        return succeed(Condition.pageInfo(pages));
+        IPage<VideoLessonGroupVo> pages = videoLessonGroupService.selectPage(PageUtil.getPage(query), query);
+        return succeed(PageUtil.pageInfo(pages));
     }
 
     /**

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

@@ -1,25 +1,14 @@
 package com.yonge.cooleshow.teacher.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import javax.validation.Valid;
-import com.yonge.cooleshow.biz.dal.dto.VideoLessonGroupDetailDto;
-import com.yonge.cooleshow.biz.dal.dto.search.VideoLessonGroupSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.VideoLessonSearch;
-import com.yonge.cooleshow.biz.dal.support.Condition;
-import com.yonge.cooleshow.biz.dal.support.Query;
-import com.yonge.cooleshow.biz.dal.valid.AddGroup;
-import com.yonge.cooleshow.biz.dal.valid.UpdateGroup;
+import com.yonge.cooleshow.biz.dal.support.PageUtil;
 import com.yonge.cooleshow.biz.dal.valid.impl.ValidList;
 import com.yonge.cooleshow.biz.dal.vo.VideoLessonGroupDetailUpVo;
-import com.yonge.cooleshow.biz.dal.vo.VideoLessonGroupVo;
 import com.yonge.cooleshow.biz.dal.vo.VideoLessonPurchaseStudent;
 import com.yonge.cooleshow.common.page.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -55,8 +44,8 @@ public class VideoLessonGroupDetailController extends BaseController {
     @ApiOperation(value = "查询视频课", httpMethod="POST", consumes="application/json", produces="application/json")
     @PostMapping(value="/page", consumes="application/json", produces="application/json")
     public HttpResponseResult<PageInfo<VideoLessonGroupDetail>> page(@RequestBody VideoLessonSearch query) {
-        IPage<VideoLessonGroupDetail> pages = videoLessonGroupDetailService.selectPage(Condition.getPage(query), query);
-        return succeed(Condition.pageInfo(pages));
+        IPage<VideoLessonGroupDetail> pages = videoLessonGroupDetailService.selectPage(PageUtil.getPage(query), query);
+        return succeed(PageUtil.pageInfo(pages));
     }
 
     /**
@@ -67,8 +56,8 @@ public class VideoLessonGroupDetailController extends BaseController {
     @ApiOperation(value = "根据组id查询购买用户", httpMethod="POST", consumes="application/json", produces="application/json")
     @PostMapping(value="/pageStudent", consumes="application/json", produces="application/json")
     public HttpResponseResult<PageInfo<VideoLessonPurchaseStudent>> pageStudent(@RequestBody VideoLessonSearch query) {
-        IPage<VideoLessonPurchaseStudent> pages = videoLessonGroupDetailService.selectPageStudent(Condition.getPage(query), query);
-        return succeed(Condition.pageInfo(pages));
+        IPage<VideoLessonPurchaseStudent> pages = videoLessonGroupDetailService.selectPageStudent(PageUtil.getPage(query), query);
+        return succeed(PageUtil.pageInfo(pages));
     }
 
     /**