分页查询参数对象统一

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

@@ -4,7 +4,7 @@ import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dao.EmployeeDao;
 import com.yonge.cooleshow.biz.dal.dto.search.EmployeeSearch;
-import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.common.page.QueryInfo;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.page.PageInfo;
 import io.swagger.annotations.Api;

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

@@ -2,7 +2,7 @@ package com.yonge.cooleshow.biz.dal.dto.search;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
-import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.common.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -14,7 +14,7 @@ import java.util.Date;
  * @Data: 2022/3/21 15:26
  */
 @ApiModel(value = "AuthEntryRecordSearch", description = "审核列表查询")
-public class AuthEntryRecordSearch extends Query {
+public class AuthEntryRecordSearch extends QueryInfo{
     @ApiModelProperty(value = "老师编号/名称/电话")
     private String search;
     @ApiModelProperty(value = "审批人")

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

@@ -1,6 +1,6 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
-import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.common.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 
 /**
@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModel;
  * @Data: 2022-03-30 13:53:51
  */
 @ApiModel(value = "CourseHomeworkSearch对象", description = "课程作业表查询对象")
-public class CourseHomeworkSearch extends Query{
+public class CourseHomeworkSearch extends QueryInfo{
 	private static final long serialVersionUID = 1L;
 
 }

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

@@ -1,6 +1,6 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
-import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.common.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 
 /**
@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModel;
  * @Data: 2022-03-30 13:53:51
  */
 @ApiModel(value = "CourseScheduleRepliedSearch对象", description = "课程点评查询对象")
-public class CourseScheduleRepliedSearch extends Query{
+public class CourseScheduleRepliedSearch extends QueryInfo {
 	private static final long serialVersionUID = 1L;
 
 }

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

@@ -3,7 +3,7 @@ package com.yonge.cooleshow.biz.dal.dto.search;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yonge.cooleshow.biz.dal.enums.GenderEnum;
 import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
-import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.common.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -15,7 +15,7 @@ import java.util.Date;
  * @Data: 2022/3/21 15:26
  */
 @ApiModel(value = "StudentSearch", description = "学院管理查询")
-public class EmployeeSearch extends Query {
+public class EmployeeSearch extends QueryInfo{
     @ApiModelProperty(value = "学院编号/昵称/电话")
     private String search;
     @ApiModelProperty(value = "性别 0女 1男")

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

@@ -1,7 +1,7 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
 import com.yonge.cooleshow.biz.dal.enums.StateEnum;
-import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.common.page.QueryInfo;
 import com.yonge.toolset.utils.string.StringUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -16,7 +16,7 @@ import java.util.List;
  * @date: 2022-03-31
  */
 @ApiModel(value = "MusicAlbumSearch", description = "专辑列表查询")
-public class MusicAlbumSearch extends Query {
+public class MusicAlbumSearch extends QueryInfo{
 
     @ApiModelProperty("专辑编号/名称")
     private String idAndName;

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

@@ -1,6 +1,6 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
-import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.common.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 
 /**
@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModel;
  * @Data: 2022-04-02 10:05:39
  */
 @ApiModel(value = "MusicSheetPracticeRecordSearch对象", description = "曲目练习记录表查询对象")
-public class MusicSheetPracticeRecordSearch extends Query{
+public class MusicSheetPracticeRecordSearch extends QueryInfo{
 	private static final long serialVersionUID = 1L;
 
 }

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

@@ -2,7 +2,7 @@ package com.yonge.cooleshow.biz.dal.dto.search;
 
 import com.yonge.cooleshow.biz.dal.enums.AuditEnum;
 import com.yonge.cooleshow.biz.dal.enums.StateEnum;
-import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.common.page.QueryInfo;
 import com.yonge.toolset.utils.string.StringUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -17,7 +17,7 @@ import java.util.List;
  * @date: 2022-03-30
  */
 @ApiModel(value = "MusicSheetSearch对象", description = "曲目表查询对象")
-public class MusicSheetSearch  extends Query {
+public class MusicSheetSearch  extends QueryInfo{
 
     @ApiModelProperty("曲目编号/名称")
     private String idAndName;

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

@@ -1,7 +1,7 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
 import com.yonge.cooleshow.biz.dal.enums.StateEnum;
-import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.common.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
  * @Data: 2022-03-29 17:47:57
  */
 @ApiModel(value = "MusicTagSearch对象", description = "音乐标签表查询对象")
-public class MusicTagSearch extends Query{
+public class MusicTagSearch extends QueryInfo{
 	private static final long serialVersionUID = 1L;
 
 	@ApiModelProperty("标签编号/名称")

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

@@ -1,6 +1,6 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
-import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.common.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 
 /**
@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModel;
  * @Data: 2022-03-30 13:53:51
  */
 @ApiModel(value = "OrderDetailSearch对象", description = "平台订单表查询对象")
-public class OrderDetailSearch extends Query{
+public class OrderDetailSearch extends QueryInfo{
 	private static final long serialVersionUID = 1L;
 
 }

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

@@ -1,6 +1,6 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
-import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.common.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 
 /**
@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModel;
  * @Data: 2022-03-30 13:53:51
  */
 @ApiModel(value = "OrderRefundsSearch对象", description = "用户退款表查询对象")
-public class OrderRefundsSearch extends Query{
+public class OrderRefundsSearch extends QueryInfo{
 	private static final long serialVersionUID = 1L;
 
 }

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

@@ -1,6 +1,6 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
-import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.common.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 
 /**
@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModel;
  * @Data: 2022-03-30 13:53:51
  */
 @ApiModel(value = "OrderSearch对象", description = "平台订单表查询对象")
-public class OrderSearch extends Query{
+public class OrderSearch extends QueryInfo{
 	private static final long serialVersionUID = 1L;
 
 }

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

@@ -1,6 +1,6 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
-import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.common.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 
 /**
@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModel;
  * @Data: 2022-03-30 13:53:51
  */
 @ApiModel(value = "StudentAttendanceSearch对象", description = "学生考勤表查询对象")
-public class StudentAttendanceSearch extends Query{
+public class StudentAttendanceSearch extends QueryInfo{
 	private static final long serialVersionUID = 1L;
 
 }

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

@@ -1,6 +1,6 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
-import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.common.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 
 /**
@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModel;
  * @Data: 2022-03-30 13:53:51
  */
 @ApiModel(value = "StudentCourseHomeworkSearch对象", description = "学生课程作业查询对象")
-public class StudentCourseHomeworkSearch extends Query{
+public class StudentCourseHomeworkSearch extends QueryInfo{
 	private static final long serialVersionUID = 1L;
 
 }

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

@@ -1,7 +1,7 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.common.page.QueryInfo;
 import com.yonge.toolset.utils.string.StringUtil;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang.StringUtils;
@@ -17,7 +17,7 @@ import java.util.List;
  * @author liujunchi
  * @date 2022-04-02
  */
-public class StudentMusicSheetOrderSearch extends Query {
+public class StudentMusicSheetOrderSearch extends QueryInfo{
 
     @ApiModelProperty(value = "学生id",required = true)
     @NotNull(message = "学生编号不能为空")

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

@@ -3,7 +3,7 @@ package com.yonge.cooleshow.biz.dal.dto.search;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yonge.cooleshow.biz.dal.enums.GenderEnum;
 import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
-import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.common.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -15,7 +15,7 @@ import java.util.Date;
  * @Data: 2022/3/21 15:26
  */
 @ApiModel(value = "StudentSearch", description = "学院管理查询")
-public class StudentSearch extends Query {
+public class StudentSearch extends QueryInfo{
     @ApiModelProperty(value = "学员编号/昵称/电话")
     private String search;
     @ApiModelProperty(value = "性别 0女 1男")

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

@@ -2,7 +2,7 @@ package com.yonge.cooleshow.biz.dal.dto.search;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yonge.cooleshow.biz.dal.enums.AuditEnum;
-import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.common.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -16,7 +16,7 @@ import java.util.Date;
  * @date 2022-04-02
  */
 @ApiModel(value = "TeacherMusicSheetAuditSearch", description = "老师乐谱审核查询")
-public class TeacherMusicSheetAuditSearch extends Query {
+public class TeacherMusicSheetAuditSearch extends QueryInfo{
 
     @ApiModelProperty("老师编号/名称/电话")
     private String idAndName;

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

@@ -1,7 +1,7 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.common.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -16,7 +16,7 @@ import java.util.Date;
  * @date 2022-04-02
  */
 @ApiModel(value = "TeacherMusicSheetSearch", description = "老师详情乐谱查询")
-public class TeacherMusicSheetSearch extends Query {
+public class TeacherMusicSheetSearch extends QueryInfo{
 
     @ApiModelProperty(value = "老师编号",required = true)
     @NotNull(message = "老师ID不为空")

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

@@ -1,7 +1,7 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
 import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
-import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.common.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
  * @Data: 2022/3/21 15:26
  */
 @ApiModel(value = "TeacherSearch", description = "老师管理查询")
-public class TeacherSearch extends Query {
+public class TeacherSearch extends QueryInfo{
     @ApiModelProperty(value = "老师编号/昵称/电话")
     private String search;
     @ApiModelProperty(value = "老师类型 TOURIST 游客 ENTRY 认证老师 MUSICIAN 平台音乐人")

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

@@ -1,6 +1,6 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
-import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.common.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 
 /**
@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModel;
  * @Data: 2022-03-30 13:53:51
  */
 @ApiModel(value = "TeacherWithdrawalSearch对象", description = "老师账户提现表查询对象")
-public class TeacherWithdrawalSearch extends Query{
+public class TeacherWithdrawalSearch extends QueryInfo{
 	private static final long serialVersionUID = 1L;
 
 }

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

@@ -1,6 +1,6 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
-import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.common.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 
 /**
@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModel;
  * @Data: 2022-03-30 13:53:51
  */
 @ApiModel(value = "UserAccountRecordSearch对象", description = "用户账户流水表查询对象")
-public class UserAccountRecordSearch extends Query{
+public class UserAccountRecordSearch extends QueryInfo{
 	private static final long serialVersionUID = 1L;
 
 }

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

@@ -1,6 +1,6 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
-import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.common.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 
 /**
@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModel;
  * @Data: 2022-03-30 13:53:51
  */
 @ApiModel(value = "UserAccountSearch对象", description = "用户账户表查询对象")
-public class UserAccountSearch extends Query{
+public class UserAccountSearch extends QueryInfo{
 	private static final long serialVersionUID = 1L;
 
 }

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

@@ -1,6 +1,6 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
-import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.common.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 
 /**
@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModel;
  * @Data: 2022-03-30 13:53:51
  */
 @ApiModel(value = "UserBankCardSearch对象", description = "用户绑卡记录表查询对象")
-public class UserBankCardSearch extends Query{
+public class UserBankCardSearch extends QueryInfo{
 	private static final long serialVersionUID = 1L;
 
 }

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

@@ -1,7 +1,7 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
 import com.yonge.cooleshow.biz.dal.enums.AuditEnum;
-import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.common.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
  * @date: 2022/3/30 11:32
  */
 @ApiModel(value = "VideoLessonGroupSearch", description = "视频课组列表查询")
-public class VideoLessonGroupSearch extends Query {
+public class VideoLessonGroupSearch extends QueryInfo{
     @ApiModelProperty(value = "审核状态(0:待审核 1:通过 2:未通过)")
     private AuditEnum auditStatus;
 

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

@@ -2,7 +2,7 @@ package com.yonge.cooleshow.biz.dal.dto.search;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yonge.cooleshow.biz.dal.enums.AuditEnum;
-import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.common.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -14,7 +14,7 @@ import java.util.Date;
  * @date: 2022/3/30 11:32
  */
 @ApiModel(value = "VideoLessonGroupSearch", description = "视频课组列表查询")
-public class VideoLessonSearch extends Query {
+public class VideoLessonSearch extends QueryInfo{
     @ApiModelProperty(value = "视频组id")
     private Long videoLessonGroupId;
 

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

@@ -1,6 +1,6 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
-import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.common.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 
 /**
@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModel;
  * @Data: 2022-03-30 13:53:51
  */
 @ApiModel(value = "VipCardRecordSearch对象", description = "购买会员卡记录表查询对象")
-public class VipCardRecordSearch extends Query{
+public class VipCardRecordSearch extends QueryInfo{
 	private static final long serialVersionUID = 1L;
 
 }

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

@@ -6,7 +6,7 @@ import com.yonge.cooleshow.auth.api.entity.SysRole;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dto.search.EmployeeSearch;
 import com.yonge.cooleshow.biz.dal.entity.Employee;
-import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.common.page.QueryInfo;
 import com.yonge.cooleshow.common.page.PageInfo;
 import com.yonge.cooleshow.common.service.BaseService;
 
@@ -27,7 +27,7 @@ public interface EmployeeService extends BaseService<Long, Employee> {
      * @updateTime 2022/3/25 13:44
      * @return: com.baomidou.mybatisplus.core.metadata.IPage<com.yonge.cooleshow.biz.dal.entity.Employee>
      */
-    PageInfo<Employee> selectPage(Query page, EmployeeSearch employeeSearch);
+    PageInfo<Employee> selectPage(QueryInfo page, EmployeeSearch employeeSearch);
     /**
      * 新增员工
      * @param employee

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

@@ -7,7 +7,7 @@ import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.auth.api.enums.SysUserType;
 import com.yonge.cooleshow.biz.dal.dto.search.EmployeeSearch;
 import com.yonge.cooleshow.biz.dal.support.PageUtil;
-import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.common.page.QueryInfo;
 import com.yonge.cooleshow.common.page.PageInfo;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.ibatis.annotations.Param;
@@ -40,7 +40,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Long, Employee> impleme
     }
 
     @Override
-    public PageInfo<Employee> selectPage(Query page, EmployeeSearch employeeSearch) {
+    public PageInfo<Employee> selectPage(QueryInfo page, EmployeeSearch employeeSearch) {
         Page<Employee> pageInfo = PageUtil.getPage(page.getPage(), page.getRows());
         pageInfo.setDesc("id_");
         return PageUtil.pageInfo(employeeDao.queryPage(pageInfo,employeeSearch));

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

@@ -1,44 +0,0 @@
-package com.yonge.cooleshow.biz.dal.support;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 视图包装基类
- *
- * @author Chill
- */
-public abstract class BaseEntityWrapper<E, V> {
-
-	/**
-	 * 单个实体类包装
-	 * @param entity
-	 * @return
-	 */
-	public abstract V entityVO(E entity);
-
-	/**
-	 * 实体类集合包装
-	 * @param list
-	 * @return
-	 */
-	public List<V> listVO(List<E> list) {
-		return list.stream().map(this::entityVO).collect(Collectors.toList());
-	}
-
-	/**
-	 * 分页实体类集合包装
-	 * @param pages
-	 * @return
-	 */
-	public IPage<V> pageVO(IPage<E> pages) {
-		List<V> records = listVO(pages.getRecords());
-		IPage<V> pageVo = new Page<>(pages.getCurrent(), pages.getSize(), pages.getTotal());
-		pageVo.setRecords(records);
-		return pageVo;
-	}
-
-}

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

@@ -1,88 +0,0 @@
-package com.yonge.cooleshow.biz.dal.support;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-
-import java.io.Serializable;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * 分页模型
- *
- * @author Chill
- */
-public class BasePage<T> implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * 查询数据列表
-	 */
-	private List<T> records = Collections.emptyList();
-
-	/**
-	 * 总数
-	 */
-	private long total = 0;
-	/**
-	 * 每页显示条数，默认 10
-	 */
-	private long size = 10;
-
-	/**
-	 * 当前页
-	 */
-	private long current = 1;
-
-	public static long getSerialVersionUID() {
-		return serialVersionUID;
-	}
-
-	public List<T> getRecords() {
-		return records;
-	}
-
-	public void setRecords(List<T> records) {
-		this.records = records;
-	}
-
-	public long getTotal() {
-		return total;
-	}
-
-	public void setTotal(long total) {
-		this.total = total;
-	}
-
-	public long getSize() {
-		return size;
-	}
-
-	public void setSize(long size) {
-		this.size = size;
-	}
-
-	public long getCurrent() {
-		return current;
-	}
-
-	public void setCurrent(long current) {
-		this.current = current;
-	}
-
-	/**
-	 * mybatis-plus分页模型转化
-	 *
-	 * @param page 分页实体类
-	 * @return BasePage<T>
-	 */
-	public static <T> BasePage<T> of(IPage<T> page) {
-		BasePage<T> basePage = new BasePage<>();
-		basePage.setRecords(page.getRecords());
-		basePage.setTotal(page.getTotal());
-		basePage.setSize(page.getSize());
-		basePage.setCurrent(page.getCurrent());
-		return basePage;
-	}
-
-}

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

@@ -4,6 +4,7 @@ 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.cooleshow.common.page.QueryInfo;
 import com.yonge.toolset.utils.string.StringUtil;
 import org.springframework.beans.BeanUtils;
 
@@ -17,6 +18,9 @@ import java.util.Optional;
  */
 public class PageUtil {
 
+    private static final String ASC = "ASC";
+    private static final String DESC = "DESC";
+
     private static Integer toInt(Integer num,Integer bak){
         if(null == num || 0 == num){
             return bak;
@@ -29,10 +33,14 @@ public class PageUtil {
      * @param query 查询条件
      * @return IPage
      */
-    public static <T> IPage<T> getPage(Query query) {
+    public static <T> IPage<T> getPage(QueryInfo 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())));
+        if(ASC.equals(query.getOrder())){
+            page.setAsc(StringUtil.toStrArray(SqlKeyword.filter(query.getOrder())));
+        }
+        if(DESC.equals(query.getOrder())){
+            page.setDesc(StringUtil.toStrArray(SqlKeyword.filter(query.getOrder())));
+        }
         return page;
     }
 

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

@@ -1,71 +0,0 @@
-package com.yonge.cooleshow.biz.dal.support;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-
-/**
- * 分页工具
- *
- * @author Chill
- */
-@ApiModel(description = "查询条件")
-public class Query implements Serializable {
-
-	/**
-	 * 当前页
-	 */
-	@ApiModelProperty(value = "当前页")
-	private Integer page;
-
-	/**
-	 * 每页的数量
-	 */
-	@ApiModelProperty(value = "每页的数量")
-	private Integer rows;
-
-	/**
-	 * 正排序规则
-	 */
-	@ApiModelProperty(hidden = true)
-	private String ascs;
-
-	/**
-	 * 倒排序规则
-	 */
-	@ApiModelProperty(hidden = true)
-	private String descs;
-
-	public Integer getPage() {
-		return page;
-	}
-
-	public void setPage(Integer page) {
-		this.page = page;
-	}
-
-	public Integer getRows() {
-		return rows;
-	}
-
-	public void setRows(Integer rows) {
-		this.rows = rows;
-	}
-
-	public String getAscs() {
-		return ascs;
-	}
-
-	public void setAscs(String ascs) {
-		this.ascs = ascs;
-	}
-
-	public String getDescs() {
-		return descs;
-	}
-
-	public void setDescs(String descs) {
-		this.descs = descs;
-	}
-}

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

@@ -10,7 +10,7 @@ import com.yonge.cooleshow.biz.dal.enums.StateEnum;
 import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.biz.dal.service.MusicAlbumService;
 import com.yonge.cooleshow.biz.dal.support.PageUtil;
-import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.common.page.QueryInfo;
 import com.yonge.cooleshow.biz.dal.vo.AlbumDetailVo;
 import com.yonge.cooleshow.biz.dal.vo.MusicAlbumVo;
 import com.yonge.cooleshow.common.controller.BaseController;
@@ -92,7 +92,7 @@ public class MusicAlbumController extends BaseController {
      */
     @GetMapping("/favorite")
     @ApiOperation(value = "收藏专辑列表")
-    public HttpResponseResult<PageInfo<MusicAlbumVo>> favoriteAlbum(Query query) {
+    public HttpResponseResult<PageInfo<MusicAlbumVo>> favoriteAlbum(QueryInfo query) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");

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

@@ -9,7 +9,7 @@ import com.yonge.cooleshow.biz.dal.enums.AuditEnum;
 import com.yonge.cooleshow.biz.dal.enums.StateEnum;
 import com.yonge.cooleshow.biz.dal.service.MusicSheetService;
 import com.yonge.cooleshow.biz.dal.support.PageUtil;
-import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.common.page.QueryInfo;
 import com.yonge.cooleshow.biz.dal.vo.MusicSheetDetailVo;
 import com.yonge.cooleshow.biz.dal.vo.MusicSheetVo;
 import com.yonge.cooleshow.common.controller.BaseController;
@@ -87,7 +87,7 @@ public class MusicSheetController extends BaseController {
      */
     @GetMapping("/my")
     @ApiOperation(value = "我的单曲")
-    public HttpResponseResult<PageInfo<MusicSheetVo>> myMusic(Query query) {
+    public HttpResponseResult<PageInfo<MusicSheetVo>> myMusic(QueryInfo query) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");
@@ -106,7 +106,7 @@ public class MusicSheetController extends BaseController {
      */
     @GetMapping("/favorite")
     @ApiOperation(value = "收藏单曲")
-    public HttpResponseResult<PageInfo<MusicSheetVo>> favoriteMusic(Query query) {
+    public HttpResponseResult<PageInfo<MusicSheetVo>> favoriteMusic(QueryInfo query) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");
@@ -125,7 +125,7 @@ public class MusicSheetController extends BaseController {
      */
     @GetMapping("/practice")
     @ApiOperation(value = "最近练习")
-    public HttpResponseResult<PageInfo<MusicSheetVo>> practiceMusic(Query query) {
+    public HttpResponseResult<PageInfo<MusicSheetVo>> practiceMusic(QueryInfo query) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");