修改分页请求参数和响应

RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/common/PageRequest.java

@@ -1,31 +0,0 @@
-package org.dromara.common.core.common;
-
-import lombok.Data;
-import org.dromara.common.core.constant.CommonConstant;
-
-/**
- * 分页请求
- */
-@Data
-public class PageRequest {
-
-    /**
-     * 当前页号
-     */
-    private int current = 1;
-
-    /**
-     * 页面大小
-     */
-    private int pageSize = 10;
-
-    /**
-     * 排序字段
-     */
-    private String sortField;
-
-    /**
-     * 排序顺序（默认升序）
-     */
-    private String sortOrder = CommonConstant.SORT_ORDER_ASC;
-}

RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/controller/BusMachineryController.java

@@ -1,7 +1,6 @@
 package org.dromara.machinery.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
@@ -13,6 +12,8 @@ import org.dromara.common.excel.utils.ExcelUtil;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.machinery.domain.req.machinery.MachineryCreateReq;
 import org.dromara.machinery.domain.req.machinery.MachineryQueryReq;
@@ -43,8 +44,8 @@ public class BusMachineryController extends BaseController {
      */
     @SaCheckPermission("machinery:machinery:list")
     @GetMapping("/list")
-    public R<Page<BusMachineryVo>> list(MachineryQueryReq req) {
+    public TableDataInfo<BusMachineryVo> list(MachineryQueryReq req, PageQuery pageQuery) {
-        return R.ok(busMachineryService.queryPageList(req));
+        return busMachineryService.queryPageList(req, pageQuery);
     }
 
     /**

RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/controller/BusMachineryDetailController.java

@@ -1,7 +1,6 @@
 package org.dromara.machinery.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
@@ -13,6 +12,8 @@ import org.dromara.common.excel.utils.ExcelUtil;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.machinery.domain.req.machinerydetail.MachineryDetailCreateReq;
 import org.dromara.machinery.domain.req.machinerydetail.MachineryDetailQueryReq;
@@ -43,8 +44,8 @@ public class BusMachineryDetailController extends BaseController {
      */
     @SaCheckPermission("machinery:machineryDetail:list")
     @GetMapping("/list")
-    public R<Page<BusMachineryDetailVo>> list(MachineryDetailQueryReq req) {
+    public TableDataInfo<BusMachineryDetailVo> list(MachineryDetailQueryReq req, PageQuery pageQuery) {
-        return R.ok(busMachineryDetailService.queryPageList(req));
+        return busMachineryDetailService.queryPageList(req, pageQuery);
     }
 
     /**

RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinery/MachineryQueryReq.java

@@ -1,8 +1,6 @@
 package org.dromara.machinery.domain.req.machinery;
 
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.dromara.common.core.common.PageRequest;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -11,9 +9,8 @@ import java.io.Serializable;
  * @author lcj
  * @date 2025/3/5 14:31
  */
-@EqualsAndHashCode(callSuper = true)
 @Data
-public class MachineryQueryReq extends PageRequest implements Serializable {
+public class MachineryQueryReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 3252651952758479341L;

RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinerydetail/MachineryDetailQueryReq.java

@@ -1,8 +1,6 @@
 package org.dromara.machinery.domain.req.machinerydetail;
 
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.dromara.common.core.common.PageRequest;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -12,9 +10,8 @@ import java.util.Date;
  * @author lcj
  * @date 2025/3/5 14:31
  */
-@EqualsAndHashCode(callSuper = true)
 @Data
-public class MachineryDetailQueryReq extends PageRequest implements Serializable {
+public class MachineryDetailQueryReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 3252651952758479341L;

RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/IBusMachineryDetailService.java

@@ -3,6 +3,8 @@ package org.dromara.machinery.service;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.machinery.domain.BusMachineryDetail;
 import org.dromara.machinery.domain.req.machinerydetail.MachineryDetailCreateReq;
 import org.dromara.machinery.domain.req.machinerydetail.MachineryDetailQueryReq;
@@ -31,10 +33,11 @@ public interface IBusMachineryDetailService extends IService<BusMachineryDetail>
     /**
      * 分页查询机械详情列表
      *
-     * @param req 查询条件
+     * @param req       查询条件
+     * @param pageQuery 分页参数
      * @return 机械详情分页列表
      */
-    Page<BusMachineryDetailVo> queryPageList(MachineryDetailQueryReq req);
+    TableDataInfo<BusMachineryDetailVo> queryPageList(MachineryDetailQueryReq req, PageQuery pageQuery);
 
     /**
      * 查询符合条件的机械详情列表

RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/IBusMachineryService.java

@@ -3,6 +3,8 @@ package org.dromara.machinery.service;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.machinery.domain.BusMachinery;
 import org.dromara.machinery.domain.req.machinery.MachineryCreateReq;
 import org.dromara.machinery.domain.req.machinery.MachineryQueryReq;
@@ -31,10 +33,11 @@ public interface IBusMachineryService extends IService<BusMachinery> {
     /**
      * 分页查询机械列表
      *
-     * @param req 查询条件
+     * @param req       查询条件
+     * @param pageQuery 分页条件
      * @return 机械分页列表
      */
-    Page<BusMachineryVo> queryPageList(MachineryQueryReq req);
+    TableDataInfo<BusMachineryVo> queryPageList(MachineryQueryReq req, PageQuery pageQuery);
 
     /**
      * 查询符合条件的机械列表

RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/impl/BusMachineryDetailServiceImpl.java

@@ -1,17 +1,16 @@
 package org.dromara.machinery.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import jakarta.annotation.Resource;
-import org.dromara.common.core.constant.CommonConstant;
 import org.dromara.common.core.constant.HttpStatus;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.ObjectUtils;
 import org.dromara.common.core.utils.StringUtils;
-import org.dromara.common.core.utils.sql.SqlUtil;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.machinery.domain.BusMachinery;
 import org.dromara.machinery.domain.BusMachineryDetail;
@@ -71,16 +70,15 @@ public class BusMachineryDetailServiceImpl extends ServiceImpl<BusMachineryDetai
     /**
      * 分页查询机械详情列表
      *
-     * @param req 查询条件
+     * @param req       查询条件
+     * @param pageQuery 分页参数
      * @return 机械详情分页列表
      */
     @Override
-    public Page<BusMachineryDetailVo> queryPageList(MachineryDetailQueryReq req) {
+    public TableDataInfo<BusMachineryDetailVo> queryPageList(MachineryDetailQueryReq req, PageQuery pageQuery) {
-        long current = req.getCurrent();
-        long size = req.getPageSize();
         // 查询数据库
-        Page<BusMachineryDetail> result = this.page(new Page<>(current, size), this.getQueryWrapper(req));
+        Page<BusMachineryDetail> result = this.page(pageQuery.build(), this.getQueryWrapper(req));
-        return this.getVoPage(result);
+        return TableDataInfo.build(this.getVoPage(result));
     }
 
     /**
@@ -231,9 +229,6 @@ public class BusMachineryDetailServiceImpl extends ServiceImpl<BusMachineryDetai
         Date entryTime = req.getEntryTime();
         String remark = req.getRemark();
         Long machineryId = req.getMachineryId();
-        String sortField = req.getSortField();
-        String sortOrder = req.getSortOrder();
-        String underlineSortField = StrUtil.toUnderlineCase(sortField);
         // 模糊查询
         queryWrapper.like(StringUtils.isNotBlank(checkoutNumber), "checkout_number", checkoutNumber);
         queryWrapper.like(StringUtils.isNotBlank(checkoutUnit), "checkout_unit", checkoutUnit);
@@ -245,10 +240,6 @@ public class BusMachineryDetailServiceImpl extends ServiceImpl<BusMachineryDetai
         queryWrapper.eq(ObjectUtils.isNotEmpty(type), "type", type);
         queryWrapper.eq(ObjectUtils.isNotEmpty(entryTime), "entryTime", entryTime);
         queryWrapper.eq(ObjectUtils.isNotEmpty(machineryId), "machinery_id", machineryId);
-        // 排序规则
-        queryWrapper.orderBy(SqlUtil.validSortField(sortField),
-            sortOrder.equals(CommonConstant.SORT_ORDER_ASC),
-            underlineSortField);
         return queryWrapper;
     }
 

RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/impl/BusMachineryServiceImpl.java

@@ -6,12 +6,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import jakarta.annotation.Resource;
-import org.dromara.common.core.constant.CommonConstant;
 import org.dromara.common.core.constant.HttpStatus;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.ObjectUtils;
 import org.dromara.common.core.utils.StringUtils;
-import org.dromara.common.core.utils.sql.SqlUtil;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.machinery.domain.BusMachinery;
 import org.dromara.machinery.domain.BusMachineryDetail;
@@ -66,16 +66,15 @@ public class BusMachineryServiceImpl extends ServiceImpl<BusMachineryMapper, Bus
     /**
      * 分页查询机械列表
      *
-     * @param req 查询条件
+     * @param req       查询条件
+     * @param pageQuery 分页参数
      * @return 机械分页列表
      */
     @Override
-    public Page<BusMachineryVo> queryPageList(MachineryQueryReq req) {
+    public TableDataInfo<BusMachineryVo> queryPageList(MachineryQueryReq req, PageQuery pageQuery) {
-        long current = req.getCurrent();
-        long size = req.getPageSize();
         // 查询数据库
-        Page<BusMachinery> result = this.page(new Page<>(current, size), this.getQueryWrapper(req));
+        Page<BusMachinery> result = this.page(pageQuery.build(), this.getQueryWrapper(req));
-        return this.getVoPage(result);
+        return TableDataInfo.build(this.getVoPage(result));
     }
 
     /**
@@ -223,9 +222,6 @@ public class BusMachineryServiceImpl extends ServiceImpl<BusMachineryMapper, Bus
         Long number = req.getNumber();
         String principal = req.getPrincipal();
         String remark = req.getRemark();
-        String sortField = req.getSortField();
-        String sortOrder = req.getSortOrder();
-        String underlineSortField = StrUtil.toUnderlineCase(sortField);
         // 模糊查询
         queryWrapper.like(StringUtils.isNotBlank(machineryName), "machinery_name", machineryName);
         queryWrapper.like(StringUtils.isNotBlank(principal), "principal", principal);
@@ -235,10 +231,6 @@ public class BusMachineryServiceImpl extends ServiceImpl<BusMachineryMapper, Bus
         queryWrapper.eq(ObjectUtils.isNotEmpty(id), "id", id);
         queryWrapper.eq(ObjectUtils.isNotEmpty(projectId), "project_id", projectId);
         queryWrapper.eq(ObjectUtils.isNotEmpty(number), "number", number);
-        // 排序规则
-        queryWrapper.orderBy(SqlUtil.validSortField(sortField),
-            sortOrder.equals(CommonConstant.SORT_ORDER_ASC),
-            underlineSortField);
         return queryWrapper;
     }
 

RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/BusCompanyController.java

@@ -1,7 +1,6 @@
 package org.dromara.materials.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
@@ -15,6 +14,8 @@ import org.dromara.common.excel.utils.ExcelUtil;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.materials.domain.req.company.CompanyCreateReq;
 import org.dromara.materials.domain.req.company.CompanyQueryReq;
@@ -45,8 +46,8 @@ public class BusCompanyController extends BaseController {
      */
     @SaCheckPermission("materials:company:list")
     @GetMapping("/list")
-    public R<Page<BusCompanyVo>> list(CompanyQueryReq req) {
+    public TableDataInfo<BusCompanyVo> list(CompanyQueryReq req, PageQuery pageQuery) {
-        return R.ok(busCompanyService.queryPageList(req));
+        return busCompanyService.queryPageList(req, pageQuery);
     }
 
     /**

RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/BusMaterialsController.java

@@ -1,7 +1,6 @@
 package org.dromara.materials.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
@@ -13,6 +12,8 @@ import org.dromara.common.excel.utils.ExcelUtil;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.materials.domain.req.materials.MaterialsCreateReq;
 import org.dromara.materials.domain.req.materials.MaterialsQueryReq;
@@ -43,8 +44,8 @@ public class BusMaterialsController extends BaseController {
      */
     @SaCheckPermission("materials:materials:list")
     @GetMapping("/list")
-    public R<Page<BusMaterialsVo>> list(MaterialsQueryReq req) {
+    public TableDataInfo<BusMaterialsVo> list(MaterialsQueryReq req, PageQuery pageQuery) {
-        return R.ok(busMaterialsService.queryPageList(req));
+        return busMaterialsService.queryPageList(req, pageQuery);
     }
 
     /**

RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/BusMaterialsInventoryController.java

@@ -1,7 +1,6 @@
 package org.dromara.materials.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
@@ -13,6 +12,8 @@ import org.dromara.common.excel.utils.ExcelUtil;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.materials.domain.req.materialsinventory.MaterialsInventoryCreateReq;
 import org.dromara.materials.domain.req.materialsinventory.MaterialsInventoryQueryReq;
@@ -43,8 +44,8 @@ public class BusMaterialsInventoryController extends BaseController {
      */
     @SaCheckPermission("materials:materialsInventory:list")
     @GetMapping("/list")
-    public R<Page<BusMaterialsInventoryVo>> list(MaterialsInventoryQueryReq req) {
+    public TableDataInfo<BusMaterialsInventoryVo> list(MaterialsInventoryQueryReq req, PageQuery pageQuery) {
-        return R.ok(busMaterialsInventoryService.queryPageList(req));
+        return busMaterialsInventoryService.queryPageList(req, pageQuery);
     }
 
     /**

RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/company/CompanyQueryReq.java

@@ -1,8 +1,6 @@
 package org.dromara.materials.domain.req.company;
 
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.dromara.common.core.common.PageRequest;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -11,9 +9,8 @@ import java.io.Serializable;
  * @author lcj
  * @date 2025/3/5 14:31
  */
-@EqualsAndHashCode(callSuper = true)
 @Data
-public class CompanyQueryReq extends PageRequest implements Serializable {
+public class CompanyQueryReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 5563677643070664671L;

RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MaterialsQueryReq.java

@@ -1,8 +1,6 @@
 package org.dromara.materials.domain.req.materials;
 
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.dromara.common.core.common.PageRequest;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -12,9 +10,8 @@ import java.util.Map;
  * @author lcj
  * @date 2025/3/5 14:31
  */
-@EqualsAndHashCode(callSuper = true)
 @Data
-public class MaterialsQueryReq extends PageRequest implements Serializable {
+public class MaterialsQueryReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 5563677643070664671L;

RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materialsinventory/MaterialsInventoryQueryReq.java

@@ -1,8 +1,6 @@
 package org.dromara.materials.domain.req.materialsinventory;
 
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.dromara.common.core.common.PageRequest;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -12,9 +10,8 @@ import java.util.Date;
  * @author lcj
  * @date 2025/3/5 14:31
  */
-@EqualsAndHashCode(callSuper = true)
 @Data
-public class MaterialsInventoryQueryReq extends PageRequest implements Serializable {
+public class MaterialsInventoryQueryReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 5563677643070664671L;

RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IBusCompanyService.java

@@ -3,6 +3,8 @@ package org.dromara.materials.service;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.materials.domain.BusCompany;
 import org.dromara.materials.domain.req.company.CompanyCreateReq;
 import org.dromara.materials.domain.req.company.CompanyQueryReq;
@@ -31,10 +33,11 @@ public interface IBusCompanyService extends IService<BusCompany> {
     /**
      * 分页查询公司列表
      *
-     * @param req 查询条件
+     * @param req       查询条件
+     * @param pageQuery 分页条件
      * @return 公司分页列表
      */
-    Page<BusCompanyVo> queryPageList(CompanyQueryReq req);
+    TableDataInfo<BusCompanyVo> queryPageList(CompanyQueryReq req, PageQuery pageQuery);
 
     /**
      * 查询符合条件的公司列表

RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IBusMaterialsInventoryService.java

@@ -3,6 +3,8 @@ package org.dromara.materials.service;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.materials.domain.BusMaterialsInventory;
 import org.dromara.materials.domain.req.materialsinventory.MaterialsInventoryCreateReq;
 import org.dromara.materials.domain.req.materialsinventory.MaterialsInventoryQueryReq;
@@ -31,10 +33,11 @@ public interface IBusMaterialsInventoryService extends IService<BusMaterialsInve
     /**
      * 分页查询材料出/入库列表
      *
-     * @param req 查询条件
+     * @param req       查询条件
+     * @param pageQuery 分页参数
      * @return 材料出/入库分页列表
      */
-    Page<BusMaterialsInventoryVo> queryPageList(MaterialsInventoryQueryReq req);
+    TableDataInfo<BusMaterialsInventoryVo> queryPageList(MaterialsInventoryQueryReq req, PageQuery pageQuery);
 
     /**
      * 查询符合条件的材料出/入库列表

RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IBusMaterialsService.java

@@ -3,6 +3,8 @@ package org.dromara.materials.service;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.materials.domain.BusMaterials;
 import org.dromara.materials.domain.req.materials.MaterialsCreateReq;
 import org.dromara.materials.domain.req.materials.MaterialsQueryReq;
@@ -31,10 +33,11 @@ public interface IBusMaterialsService extends IService<BusMaterials> {
     /**
      * 分页查询材料名称列表
      *
-     * @param req 查询条件
+     * @param req       查询条件
+     * @param pageQuery 分页条件
      * @return 材料名称分页列表
      */
-    Page<BusMaterialsVo> queryPageList(MaterialsQueryReq req);
+    TableDataInfo<BusMaterialsVo> queryPageList(MaterialsQueryReq req, PageQuery pageQuery);
 
     /**
      * 查询符合条件的材料名称列表

RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/BusCompanyServiceImpl.java

@@ -1,18 +1,17 @@
 package org.dromara.materials.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import jakarta.annotation.Resource;
-import org.dromara.common.core.constant.CommonConstant;
 import org.dromara.common.core.constant.HttpStatus;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.ObjectUtils;
 import org.dromara.common.core.utils.StringUtils;
-import org.dromara.common.core.utils.sql.SqlUtil;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.materials.domain.BusCompany;
 import org.dromara.materials.domain.BusMaterials;
@@ -64,16 +63,15 @@ public class BusCompanyServiceImpl extends ServiceImpl<BusCompanyMapper, BusComp
     /**
      * 分页查询公司列表
      *
-     * @param req 查询条件
+     * @param req       查询条件
+     * @param pageQuery 分页信息
      * @return 公司分页列表
      */
     @Override
-    public Page<BusCompanyVo> queryPageList(CompanyQueryReq req) {
+    public TableDataInfo<BusCompanyVo> queryPageList(CompanyQueryReq req, PageQuery pageQuery) {
-        long current = req.getCurrent();
-        long size = req.getPageSize();
         // 查询数据库
-        Page<BusCompany> result = this.page(new Page<>(current, size), this.getQueryWrapper(req));
+        Page<BusCompany> result = this.page(pageQuery.build(), this.getQueryWrapper(req));
-        return this.getCompanyVoPage(result);
+        return TableDataInfo.build(this.getCompanyVoPage(result));
     }
 
     /**
@@ -208,9 +206,6 @@ public class BusCompanyServiceImpl extends ServiceImpl<BusCompanyMapper, BusComp
         String status = req.getStatus();
         String remark = req.getRemark();
         String qualification = req.getQualification();
-        String sortField = req.getSortField();
-        String sortOrder = req.getSortOrder();
-        String underlineSortField = StrUtil.toUnderlineCase(sortField);
         // 模糊查询
         queryWrapper.like(StringUtils.isNotBlank(companyName), "company_name", companyName);
         queryWrapper.like(StringUtils.isNotBlank(qualification), "qualification", qualification);
@@ -219,10 +214,6 @@ public class BusCompanyServiceImpl extends ServiceImpl<BusCompanyMapper, BusComp
         queryWrapper.eq(ObjectUtils.isNotEmpty(status), "status", status);
         queryWrapper.eq(ObjectUtils.isNotEmpty(id), "id", id);
         queryWrapper.eq(ObjectUtils.isNotEmpty(projectId), "project_id", projectId);
-        // 排序规则
-        queryWrapper.orderBy(SqlUtil.validSortField(sortField),
-            sortOrder.equals(CommonConstant.SORT_ORDER_ASC),
-            underlineSortField);
         return queryWrapper;
     }
 

RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/BusMaterialsInventoryServiceImpl.java

@@ -1,17 +1,16 @@
 package org.dromara.materials.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import jakarta.annotation.Resource;
-import org.dromara.common.core.constant.CommonConstant;
 import org.dromara.common.core.constant.HttpStatus;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.ObjectUtils;
 import org.dromara.common.core.utils.StringUtils;
-import org.dromara.common.core.utils.sql.SqlUtil;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.materials.domain.BusMaterials;
 import org.dromara.materials.domain.BusMaterialsInventory;
@@ -71,12 +70,10 @@ public class BusMaterialsInventoryServiceImpl extends ServiceImpl<BusMaterialsIn
      * @return 材料出/入库分页列表
      */
     @Override
-    public Page<BusMaterialsInventoryVo> queryPageList(MaterialsInventoryQueryReq req) {
+    public TableDataInfo<BusMaterialsInventoryVo> queryPageList(MaterialsInventoryQueryReq req, PageQuery pageQuery) {
-        long current = req.getCurrent();
-        long size = req.getPageSize();
         // 查询数据库
-        Page<BusMaterialsInventory> result = this.page(new Page<>(current, size), this.getQueryWrapper(req));
+        Page<BusMaterialsInventory> result = this.page(pageQuery.build(), this.getQueryWrapper(req));
-        return this.getVoPage(result);
+        return TableDataInfo.build(this.getVoPage(result));
     }
 
     /**
@@ -233,9 +230,6 @@ public class BusMaterialsInventoryServiceImpl extends ServiceImpl<BusMaterialsIn
         String recipient = req.getRecipient();
         String shipper = req.getShipper();
         String remark = req.getRemark();
-        String sortField = req.getSortField();
-        String sortOrder = req.getSortOrder();
-        String underlineSortField = StrUtil.toUnderlineCase(sortField);
         // 联表查询
         if (StringUtils.isNotBlank(materialsName)) {
             QueryWrapper<BusMaterials> materialsQueryWrapper = new QueryWrapper<>();
@@ -258,10 +252,6 @@ public class BusMaterialsInventoryServiceImpl extends ServiceImpl<BusMaterialsIn
         queryWrapper.eq(ObjectUtils.isNotEmpty(outPutTime), "out_put_time", outPutTime);
         queryWrapper.eq(ObjectUtils.isNotEmpty(residue), "residue", residue);
         queryWrapper.eq(ObjectUtils.isNotEmpty(outPut), "out_put", outPut);
-        // 排序规则
-        queryWrapper.orderBy(SqlUtil.validSortField(sortField),
-            sortOrder.equals(CommonConstant.SORT_ORDER_ASC),
-            underlineSortField);
         return queryWrapper;
     }
 

RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/BusMaterialsServiceImpl.java

@@ -1,7 +1,6 @@
 package org.dromara.materials.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -9,13 +8,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import jakarta.annotation.Resource;
 import lombok.RequiredArgsConstructor;
-import org.dromara.common.core.constant.CommonConstant;
 import org.dromara.common.core.constant.HttpStatus;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.ObjectUtils;
 import org.dromara.common.core.utils.StringUtils;
-import org.dromara.common.core.utils.sql.SqlUtil;
 import org.dromara.common.json.utils.JsonUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.materials.domain.BusMaterials;
 import org.dromara.materials.domain.BusMaterialsInventory;
@@ -79,16 +78,15 @@ public class BusMaterialsServiceImpl extends ServiceImpl<BusMaterialsMapper, Bus
     /**
      * 分页查询材料名称列表
      *
-     * @param req 查询条件
+     * @param req       查询条件
+     * @param pageQuery 分页条件
      * @return 材料名称分页列表
      */
     @Override
-    public Page<BusMaterialsVo> queryPageList(MaterialsQueryReq req) {
+    public TableDataInfo<BusMaterialsVo> queryPageList(MaterialsQueryReq req, PageQuery pageQuery) {
-        long current = req.getCurrent();
-        long size = req.getPageSize();
         // 查询数据库
-        Page<BusMaterials> result = this.page(new Page<>(current, size), this.getQueryWrapper(req));
+        Page<BusMaterials> result = this.page(pageQuery.build(), this.getQueryWrapper(req));
-        return this.getMaterialsVoPage(result);
+        return TableDataInfo.build(this.getMaterialsVoPage(result));
     }
 
     /**
@@ -264,9 +262,6 @@ public class BusMaterialsServiceImpl extends ServiceImpl<BusMaterialsMapper, Bus
         String remark = req.getRemark();
         String quantityCount = req.getQuantityCount();
         String status = req.getStatus();
-        String sortField = req.getSortField();
-        String sortOrder = req.getSortOrder();
-        String underlineSortField = StrUtil.toUnderlineCase(sortField);
         // 模糊查询
         queryWrapper.like(StringUtils.isNotBlank(materialsName), "materials_name", materialsName);
         queryWrapper.like(StringUtils.isNotBlank(typeSpecificationName), "type_specification_name", typeSpecificationName);
@@ -279,10 +274,6 @@ public class BusMaterialsServiceImpl extends ServiceImpl<BusMaterialsMapper, Bus
         queryWrapper.eq(ObjectUtils.isNotEmpty(id), "id", id);
         queryWrapper.eq(ObjectUtils.isNotEmpty(projectId), "project_id", projectId);
         queryWrapper.eq(ObjectUtils.isNotEmpty(companyId), "company_id", companyId);
-        // 排序规则
-        queryWrapper.orderBy(SqlUtil.validSortField(sortField),
-            sortOrder.equals(CommonConstant.SORT_ORDER_ASC),
-            underlineSortField);
         return queryWrapper;
     }
 

RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusConstructionUserController.java

@@ -1,7 +1,6 @@
 package org.dromara.project.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
@@ -13,6 +12,8 @@ import org.dromara.common.excel.utils.ExcelUtil;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.project.domain.req.constructionuser.ConstructionUserCreateReq;
 import org.dromara.project.domain.req.constructionuser.ConstructionUserQueryReq;
@@ -43,8 +44,8 @@ public class BusConstructionUserController extends BaseController {
      */
     @SaCheckPermission("project:constructionUser:list")
     @GetMapping("/list")
-    public R<Page<BusConstructionUserVo>> list(ConstructionUserQueryReq req) {
+    public TableDataInfo<BusConstructionUserVo> list(ConstructionUserQueryReq req, PageQuery pageQuery) {
-        return R.ok(busConstructionUserService.queryPageList(req));
+        return busConstructionUserService.queryPageList(req, pageQuery);
     }
 
     /**

RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusContractorController.java

@@ -1,7 +1,6 @@
 package org.dromara.project.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
@@ -13,6 +12,8 @@ import org.dromara.common.excel.utils.ExcelUtil;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.project.domain.req.contractor.ContractorCreateReq;
 import org.dromara.project.domain.req.contractor.ContractorQueryReq;
@@ -43,8 +44,8 @@ public class BusContractorController extends BaseController {
      */
     @SaCheckPermission("project:contractor:list")
     @GetMapping("/list")
-    public R<Page<BusContractorVo>> list(ContractorQueryReq req) {
+    public TableDataInfo<BusContractorVo> list(ContractorQueryReq req, PageQuery pageQuery) {
-        return R.ok(busContractorService.queryPageList(req));
+        return busContractorService.queryPageList(req, pageQuery);
     }
 
     /**

RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectController.java

@@ -1,7 +1,6 @@
 package org.dromara.project.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
@@ -15,6 +14,8 @@ import org.dromara.common.excel.utils.ExcelUtil;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.project.domain.req.project.ProjectCreateReq;
 import org.dromara.project.domain.req.project.ProjectQueryReq;
@@ -45,8 +46,8 @@ public class BusProjectController extends BaseController {
      */
     @SaCheckPermission("project:project:list")
     @GetMapping("/list")
-    public R<Page<BusProjectVo>> list(ProjectQueryReq req) {
+    public TableDataInfo<BusProjectVo> list(ProjectQueryReq req, PageQuery pageQuery) {
-        return R.ok(projectService.queryPageList(req));
+        return projectService.queryPageList(req, pageQuery);
     }
 
     /**
@@ -68,7 +69,7 @@ public class BusProjectController extends BaseController {
     @SaCheckPermission("project:project:query")
     @GetMapping("/{id}")
     public R<BusProjectVo> getInfo(@NotNull(message = "主键不能为空")
-                                @PathVariable Long id) {
+                                   @PathVariable Long id) {
         return R.ok(projectService.queryById(id));
     }
 

RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectTeamController.java

@@ -1,7 +1,6 @@
 package org.dromara.project.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
@@ -13,6 +12,8 @@ import org.dromara.common.excel.utils.ExcelUtil;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.project.domain.req.projectteam.ProjectTeamCreateReq;
 import org.dromara.project.domain.req.projectteam.ProjectTeamQueryReq;
@@ -43,8 +44,8 @@ public class BusProjectTeamController extends BaseController {
      */
     @SaCheckPermission("project:projectTeam:list")
     @GetMapping("/list")
-    public R<Page<BusProjectTeamVo>> list(ProjectTeamQueryReq req) {
+    public TableDataInfo<BusProjectTeamVo> list(ProjectTeamQueryReq req, PageQuery pageQuery) {
-        return R.ok(busProjectTeamService.queryPageList(req));
+        return busProjectTeamService.queryPageList(req, pageQuery);
     }
 
     /**

RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectTeamMemberController.java

@@ -1,7 +1,6 @@
 package org.dromara.project.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
@@ -13,6 +12,8 @@ import org.dromara.common.excel.utils.ExcelUtil;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.project.domain.req.projectteammember.ProjectTeamMemberCreateReq;
 import org.dromara.project.domain.req.projectteammember.ProjectTeamMemberQueryReq;
@@ -43,8 +44,8 @@ public class BusProjectTeamMemberController extends BaseController {
      */
     @SaCheckPermission("project:projectTeamMember:list")
     @GetMapping("/list")
-    public R<Page<BusProjectTeamMemberVo>> list(ProjectTeamMemberQueryReq req) {
+    public TableDataInfo<BusProjectTeamMemberVo> list(ProjectTeamMemberQueryReq req, PageQuery pageQuery) {
-        return R.ok(busProjectTeamMemberService.queryPageList(req));
+        return busProjectTeamMemberService.queryPageList(req, pageQuery);
     }
 
     /**

RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusUserProjectRelevancyController.java

@@ -2,8 +2,6 @@ package org.dromara.project.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
@@ -15,6 +13,8 @@ import org.dromara.common.excel.utils.ExcelUtil;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.project.domain.BusUserProjectRelevancy;
@@ -49,8 +49,8 @@ public class BusUserProjectRelevancyController extends BaseController {
      */
     @SaCheckPermission("project:projectRelevancy:list")
     @GetMapping("/list")
-    public R<Page<BusUserProjectRelevancyVo>> list(UserProjectRelevancyQueryReq req) {
+    public TableDataInfo<BusUserProjectRelevancyVo> list(UserProjectRelevancyQueryReq req, PageQuery pageQuery) {
-        return R.ok(userProjectRelevancyService.queryPageList(req));
+        return userProjectRelevancyService.queryPageList(req, pageQuery);
     }
 
     /**
@@ -68,9 +68,9 @@ public class BusUserProjectRelevancyController extends BaseController {
      */
     @SaCheckPermission("project:projectRelevancy:list")
     @GetMapping("/login/page")
-    public R<Page<BusUserProjectRelevancyVo>> pageByLoginUser(UserProjectRelevancyQueryReq req) {
+    public TableDataInfo<BusUserProjectRelevancyVo> pageByLoginUser(UserProjectRelevancyQueryReq req, PageQuery pageQuery) {
         Long userId = LoginHelper.getUserId();
-        return R.ok(userProjectRelevancyService.queryPageByUserId(userId, req));
+        return userProjectRelevancyService.queryPageByUserId(userId, req, pageQuery);
     }
 
     /**

RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/ConstructionUserQueryReq.java

@@ -1,8 +1,6 @@
 package org.dromara.project.domain.req.constructionuser;
 
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.dromara.common.core.common.PageRequest;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -11,9 +9,8 @@ import java.io.Serializable;
  * @author lcj
  * @date 2025/3/5 14:31
  */
-@EqualsAndHashCode(callSuper = true)
 @Data
-public class ConstructionUserQueryReq extends PageRequest implements Serializable {
+public class ConstructionUserQueryReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 3252651952758479341L;

RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/contractor/ContractorQueryReq.java

@@ -1,8 +1,6 @@
 package org.dromara.project.domain.req.contractor;
 
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.dromara.common.core.common.PageRequest;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -11,9 +9,8 @@ import java.io.Serializable;
  * @author lcj
  * @date 2025/3/5 14:31
  */
-@EqualsAndHashCode(callSuper = true)
 @Data
-public class ContractorQueryReq extends PageRequest implements Serializable {
+public class ContractorQueryReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 3252651952758479341L;

RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/project/ProjectQueryReq.java

@@ -1,8 +1,6 @@
 package org.dromara.project.domain.req.project;
 
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.dromara.common.core.common.PageRequest;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -11,9 +9,8 @@ import java.io.Serializable;
  * @author lcj
  * @date 2025/3/5 14:31
  */
-@EqualsAndHashCode(callSuper = true)
 @Data
-public class ProjectQueryReq extends PageRequest implements Serializable {
+public class ProjectQueryReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 5563677643070664671L;

RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteam/ProjectTeamQueryReq.java

@@ -1,8 +1,6 @@
 package org.dromara.project.domain.req.projectteam;
 
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.dromara.common.core.common.PageRequest;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -11,9 +9,8 @@ import java.io.Serializable;
  * @author lcj
  * @date 2025/3/5 14:31
  */
-@EqualsAndHashCode(callSuper = true)
 @Data
-public class ProjectTeamQueryReq extends PageRequest implements Serializable {
+public class ProjectTeamQueryReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 3252651952758479341L;

RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteammember/ProjectTeamMemberQueryReq.java

@@ -1,8 +1,6 @@
 package org.dromara.project.domain.req.projectteammember;
 
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.dromara.common.core.common.PageRequest;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -11,9 +9,8 @@ import java.io.Serializable;
  * @author lcj
  * @date 2025/3/5 14:31
  */
-@EqualsAndHashCode(callSuper = true)
 @Data
-public class ProjectTeamMemberQueryReq extends PageRequest implements Serializable {
+public class ProjectTeamMemberQueryReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 3252651952758479341L;

RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/userprojectrelevancy/UserProjectRelevancyQueryReq.java

@@ -1,8 +1,6 @@
 package org.dromara.project.domain.req.userprojectrelevancy;
 
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.dromara.common.core.common.PageRequest;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -11,9 +9,8 @@ import java.io.Serializable;
  * @author lcj
  * @date 2025/3/5 14:31
  */
-@EqualsAndHashCode(callSuper = true)
 @Data
-public class UserProjectRelevancyQueryReq extends PageRequest implements Serializable {
+public class UserProjectRelevancyQueryReq implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 3252651952758479341L;

RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusConstructionUserService.java

@@ -3,6 +3,8 @@ package org.dromara.project.service;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.project.domain.BusConstructionUser;
 import org.dromara.project.domain.req.constructionuser.ConstructionUserCreateReq;
 import org.dromara.project.domain.req.constructionuser.ConstructionUserQueryReq;
@@ -31,10 +33,11 @@ public interface IBusConstructionUserService extends IService<BusConstructionUse
     /**
      * 分页查询施工人员列表
      *
-     * @param req 查询条件
+     * @param req       查询条件
+     * @param pageQuery 分页参数
      * @return 施工人员分页列表
      */
-    Page<BusConstructionUserVo> queryPageList(ConstructionUserQueryReq req);
+    TableDataInfo<BusConstructionUserVo> queryPageList(ConstructionUserQueryReq req, PageQuery pageQuery);
 
     /**
      * 查询符合条件的施工人员列表

RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusContractorService.java

@@ -3,6 +3,8 @@ package org.dromara.project.service;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.project.domain.BusContractor;
 import org.dromara.project.domain.req.contractor.ContractorCreateReq;
 import org.dromara.project.domain.req.contractor.ContractorQueryReq;
@@ -31,10 +33,11 @@ public interface IBusContractorService extends IService<BusContractor> {
     /**
      * 分页查询分包单位列表
      *
-     * @param req 查询条件
+     * @param req       查询条件
+     * @param pageQuery 分页参数
      * @return 分包单位分页列表
      */
-    Page<BusContractorVo> queryPageList(ContractorQueryReq req);
+    TableDataInfo<BusContractorVo> queryPageList(ContractorQueryReq req, PageQuery pageQuery);
 
     /**
      * 查询符合条件的分包单位列表

RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectService.java

@@ -3,6 +3,8 @@ package org.dromara.project.service;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.project.domain.BusProject;
 import org.dromara.project.domain.req.project.ProjectCreateReq;
 import org.dromara.project.domain.req.project.ProjectQueryReq;
@@ -31,10 +33,11 @@ public interface IBusProjectService extends IService<BusProject> {
     /**
      * 分页查询项目列表
      *
-     * @param req 查询条件
+     * @param req       查询条件
+     * @param pageQuery 分页参数
      * @return 项目分页列表
      */
-    Page<BusProjectVo> queryPageList(ProjectQueryReq req);
+    TableDataInfo<BusProjectVo> queryPageList(ProjectQueryReq req, PageQuery pageQuery);
 
     /**
      * 查询符合条件的项目列表

RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectTeamMemberService.java

@@ -3,6 +3,8 @@ package org.dromara.project.service;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.project.domain.BusProjectTeamMember;
 import org.dromara.project.domain.req.projectteammember.ProjectTeamMemberCreateReq;
 import org.dromara.project.domain.req.projectteammember.ProjectTeamMemberQueryReq;
@@ -31,10 +33,11 @@ public interface IBusProjectTeamMemberService extends IService<BusProjectTeamMem
     /**
      * 分页查询项目班组下的成员列表
      *
-     * @param req 查询条件
+     * @param req       查询条件
+     * @param pageQuery 分页参数
      * @return 项目班组下的成员分页列表
      */
-    Page<BusProjectTeamMemberVo> queryPageList(ProjectTeamMemberQueryReq req);
+    TableDataInfo<BusProjectTeamMemberVo> queryPageList(ProjectTeamMemberQueryReq req, PageQuery pageQuery);
 
     /**
      * 查询符合条件的项目班组下的成员列表

RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectTeamService.java

@@ -3,6 +3,8 @@ package org.dromara.project.service;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.project.domain.BusProjectTeam;
 import org.dromara.project.domain.req.projectteam.ProjectTeamCreateReq;
 import org.dromara.project.domain.req.projectteam.ProjectTeamQueryReq;
@@ -31,10 +33,11 @@ public interface IBusProjectTeamService extends IService<BusProjectTeam> {
     /**
      * 分页查询项目班组列表
      *
-     * @param req 查询条件
+     * @param req       查询条件
+     * @param pageQuery 分页参数
      * @return 项目班组分页列表
      */
-    Page<BusProjectTeamVo> queryPageList(ProjectTeamQueryReq req);
+    TableDataInfo<BusProjectTeamVo> queryPageList(ProjectTeamQueryReq req, PageQuery pageQuery);
 
     /**
      * 查询符合条件的项目班组列表

RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusUserProjectRelevancyService.java

@@ -3,6 +3,8 @@ package org.dromara.project.service;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.project.domain.BusUserProjectRelevancy;
 import org.dromara.project.domain.req.project.ProjectBatchByProjectListReq;
 import org.dromara.project.domain.req.userprojectrelevancy.UserProjectRelevancyCreateReq;
@@ -33,10 +35,11 @@ public interface IBusUserProjectRelevancyService extends IService<BusUserProject
     /**
      * 分页查询系统用户与项目关联列表
      *
-     * @param req 查询条件
+     * @param req       查询条件
+     * @param pageQuery 分页参数
      * @return 系统用户与项目关联分页列表
      */
-    Page<BusUserProjectRelevancyVo> queryPageList(UserProjectRelevancyQueryReq req);
+    TableDataInfo<BusUserProjectRelevancyVo> queryPageList(UserProjectRelevancyQueryReq req, PageQuery pageQuery);
 
     /**
      * 查询符合条件的系统用户与项目关联列表
@@ -82,11 +85,12 @@ public interface IBusUserProjectRelevancyService extends IService<BusUserProject
     /**
      * 获取当前登录用户项目分页
      *
-     * @param userId 登录用户ID
+     * @param userId    登录用户ID
-     * @param req    分页查询条件
+     * @param req       分页查询条件
+     * @param pageQuery 分页参数
      * @return 当前登录用户项目分页
      */
-    Page<BusUserProjectRelevancyVo> queryPageByUserId(Long userId, UserProjectRelevancyQueryReq req);
+    TableDataInfo<BusUserProjectRelevancyVo> queryPageByUserId(Long userId, UserProjectRelevancyQueryReq req, PageQuery pageQuery);
 
     /**
      * 批量新增用户和项目关联

RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionUserServiceImpl.java

@@ -1,17 +1,16 @@
 package org.dromara.project.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import jakarta.annotation.Resource;
-import org.dromara.common.core.constant.CommonConstant;
 import org.dromara.common.core.constant.HttpStatus;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.ObjectUtils;
 import org.dromara.common.core.utils.StringUtils;
-import org.dromara.common.core.utils.sql.SqlUtil;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.project.domain.BusConstructionUser;
 import org.dromara.project.domain.BusContractor;
@@ -80,16 +79,15 @@ public class BusConstructionUserServiceImpl extends ServiceImpl<BusConstructionU
     /**
      * 分页查询施工人员列表
      *
-     * @param req 查询条件
+     * @param req       查询条件
+     * @param pageQuery 分页参数
      * @return 施工人员分页列表
      */
     @Override
-    public Page<BusConstructionUserVo> queryPageList(ConstructionUserQueryReq req) {
+    public TableDataInfo<BusConstructionUserVo> queryPageList(ConstructionUserQueryReq req, PageQuery pageQuery) {
-        long current = req.getCurrent();
-        long size = req.getPageSize();
         // 查询数据库
-        Page<BusConstructionUser> result = this.page(new Page<>(current, size), this.getQueryWrapper(req));
+        Page<BusConstructionUser> result = this.page(pageQuery.build(), this.getQueryWrapper(req));
-        return this.getVoPage(result);
+        return TableDataInfo.build(getVoPage(result));
     }
 
     /**
@@ -274,9 +272,6 @@ public class BusConstructionUserServiceImpl extends ServiceImpl<BusConstructionU
         String clock = req.getClock();
         Long salary = req.getSalary();
         String remark = req.getRemark();
-        String sortField = req.getSortField();
-        String sortOrder = req.getSortOrder();
-        String underlineSortField = StrUtil.toUnderlineCase(sortField);
         // 模糊查询
         queryWrapper.like(StringUtils.isNotBlank(nickName), "nick_name", nickName);
         queryWrapper.like(StringUtils.isNotBlank(userName), "user_name", userName);
@@ -310,10 +305,6 @@ public class BusConstructionUserServiceImpl extends ServiceImpl<BusConstructionU
                 .ne("team_id", notTeamId)
                 .or().isNull("team_id"));
         }
-        // 排序规则
-        queryWrapper.orderBy(SqlUtil.validSortField(sortField),
-            sortOrder.equals(CommonConstant.SORT_ORDER_ASC),
-            underlineSortField);
         return queryWrapper;
     }
 

RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusContractorServiceImpl.java

@@ -1,19 +1,18 @@
 package org.dromara.project.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import jakarta.annotation.Resource;
-import org.dromara.common.core.constant.CommonConstant;
 import org.dromara.common.core.constant.HttpStatus;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.ObjectUtils;
 import org.dromara.common.core.utils.StringUtils;
-import org.dromara.common.core.utils.sql.SqlUtil;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.project.domain.BusConstructionUser;
 import org.dromara.project.domain.BusContractor;
@@ -64,16 +63,15 @@ public class BusContractorServiceImpl extends ServiceImpl<BusContractorMapper, B
     /**
      * 分页查询分包单位列表
      *
-     * @param req 查询条件
+     * @param req       查询条件
+     * @param pageQuery 分页参数
      * @return 分包单位分页列表
      */
     @Override
-    public Page<BusContractorVo> queryPageList(ContractorQueryReq req) {
+    public TableDataInfo<BusContractorVo> queryPageList(ContractorQueryReq req, PageQuery pageQuery) {
-        long current = req.getCurrent();
-        long size = req.getPageSize();
         // 查询数据库
-        Page<BusContractor> result = this.page(new Page<>(current, size), this.getQueryWrapper(req));
+        Page<BusContractor> result = this.page(pageQuery.build(), this.getQueryWrapper(req));
-        return this.getVoPage(result);
+        return TableDataInfo.build(this.getVoPage(result));
     }
 
     /**
@@ -237,9 +235,6 @@ public class BusContractorServiceImpl extends ServiceImpl<BusContractorMapper, B
         String custodian = req.getCustodian();
         String custodianPhone = req.getCustodianPhone();
         String remark = req.getRemark();
-        String sortField = req.getSortField();
-        String sortOrder = req.getSortOrder();
-        String underlineSortField = StrUtil.toUnderlineCase(sortField);
         // 模糊查询
         queryWrapper.like(StringUtils.isNotBlank(name), "name", name);
         queryWrapper.like(StringUtils.isNotBlank(principal), "principal", principal);
@@ -249,10 +244,6 @@ public class BusContractorServiceImpl extends ServiceImpl<BusContractorMapper, B
         queryWrapper.like(StringUtils.isNotBlank(remark), "remark", remark);
         // 精确查询
         queryWrapper.eq(ObjectUtils.isNotEmpty(id), "id", id);
-        // 排序规则
-        queryWrapper.orderBy(SqlUtil.validSortField(sortField),
-            sortOrder.equals(CommonConstant.SORT_ORDER_ASC),
-            underlineSortField);
         return queryWrapper;
     }
 

RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectServiceImpl.java

@@ -1,18 +1,18 @@
 package org.dromara.project.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import jakarta.annotation.Resource;
-import org.dromara.common.core.constant.CommonConstant;
 import org.dromara.common.core.constant.HttpStatus;
+import org.dromara.common.core.constant.SystemConstants;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.ObjectUtils;
 import org.dromara.common.core.utils.StringUtils;
-import org.dromara.common.core.utils.sql.SqlUtil;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.project.domain.BusProject;
 import org.dromara.project.domain.BusUserProjectRelevancy;
@@ -64,16 +64,15 @@ public class BusProjectServiceImpl extends ServiceImpl<BusProjectMapper, BusProj
     /**
      * 分页查询项目列表
      *
-     * @param req 查询条件
+     * @param req       查询条件
+     * @param pageQuery 分页参数
      * @return 项目分页列表
      */
     @Override
-    public Page<BusProjectVo> queryPageList(ProjectQueryReq req) {
+    public TableDataInfo<BusProjectVo> queryPageList(ProjectQueryReq req, PageQuery pageQuery) {
-        long current = req.getCurrent();
-        long size = req.getPageSize();
         // 查询数据库
-        Page<BusProject> result = this.page(new Page<>(current, size), this.getQueryWrapper(req));
+        Page<BusProject> result = this.page(pageQuery.build(), this.getQueryWrapper(req));
-        return this.getVoPage(result);
+        return TableDataInfo.build(this.getVoPage(result));
     }
 
     /**
@@ -95,6 +94,7 @@ public class BusProjectServiceImpl extends ServiceImpl<BusProjectMapper, BusProj
      * @return 新项目 id
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Long insertByBo(ProjectCreateReq dto) {
         // 将实体类和 DTO 进行转换
         BusProject project = new BusProject();
@@ -109,10 +109,14 @@ public class BusProjectServiceImpl extends ServiceImpl<BusProjectMapper, BusProj
         Long projectId = project.getId();
         Long userId = LoginHelper.getUserId();
         // 同步保存用户与项目关联
-        BusUserProjectRelevancy userProjectRelevancy = new BusUserProjectRelevancy();
+        List<Long> userIdList = List.of(userId, SystemConstants.SUPER_ADMIN_ID);
-        userProjectRelevancy.setUserId(userId);
+        List<BusUserProjectRelevancy> userProjectRelevancyList = userIdList.stream().map(id -> {
-        userProjectRelevancy.setProjectId(projectId);
+            BusUserProjectRelevancy userProjectRelevancy = new BusUserProjectRelevancy();
-        boolean saveRelevancy = userProjectRelevancyService.save(userProjectRelevancy);
+            userProjectRelevancy.setUserId(id);
+            userProjectRelevancy.setProjectId(projectId);
+            return userProjectRelevancy;
+        }).toList();
+        boolean saveRelevancy = userProjectRelevancyService.saveBatch(userProjectRelevancyList);
         if (!saveRelevancy) {
             throw new ServiceException("新增用户与项目关联失败，数据库异常", HttpStatus.ERROR);
         }
@@ -249,9 +253,6 @@ public class BusProjectServiceImpl extends ServiceImpl<BusProjectMapper, BusProj
         String punchRange = req.getPunchRange();
         Long designTotal = req.getDesignTotal();
         String showHidden = req.getShowHidden();
-        String sortField = req.getSortField();
-        String sortOrder = req.getSortOrder();
-        String underlineSortField = StrUtil.toUnderlineCase(sortField);
         // 模糊查询
         queryWrapper.like(StringUtils.isNotBlank(projectName), "project_name", projectName);
         queryWrapper.like(StringUtils.isNotBlank(shortName), "short_name", shortName);
@@ -271,10 +272,6 @@ public class BusProjectServiceImpl extends ServiceImpl<BusProjectMapper, BusProj
         queryWrapper.eq(ObjectUtils.isNotEmpty(isType), "is_type", isType);
         queryWrapper.eq(ObjectUtils.isNotEmpty(designTotal), "design_total", designTotal);
         queryWrapper.eq(ObjectUtils.isNotEmpty(showHidden), "show_hidden", showHidden);
-        // 排序规则
-        queryWrapper.orderBy(SqlUtil.validSortField(sortField),
-            sortOrder.equals(CommonConstant.SORT_ORDER_ASC),
-            underlineSortField);
         return queryWrapper;
     }
 

RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamMemberServiceImpl.java

@@ -1,19 +1,18 @@
 package org.dromara.project.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import jakarta.annotation.Resource;
-import org.dromara.common.core.constant.CommonConstant;
 import org.dromara.common.core.constant.HttpStatus;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.ObjectUtils;
 import org.dromara.common.core.utils.StringUtils;
-import org.dromara.common.core.utils.sql.SqlUtil;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.project.domain.BusConstructionUser;
 import org.dromara.project.domain.BusProjectTeamMember;
@@ -73,16 +72,15 @@ public class BusProjectTeamMemberServiceImpl extends ServiceImpl<BusProjectTeamM
     /**
      * 分页查询项目班组下的成员列表
      *
-     * @param req 查询条件
+     * @param req       查询条件
+     * @param pageQuery 分页参数
      * @return 项目班组下的成员分页列表
      */
     @Override
-    public Page<BusProjectTeamMemberVo> queryPageList(ProjectTeamMemberQueryReq req) {
+    public TableDataInfo<BusProjectTeamMemberVo> queryPageList(ProjectTeamMemberQueryReq req, PageQuery pageQuery) {
-        long current = req.getCurrent();
-        long size = req.getPageSize();
         // 查询数据库
-        Page<BusProjectTeamMember> result = this.page(new Page<>(current, size), this.getQueryWrapper(req));
+        Page<BusProjectTeamMember> result = this.page(pageQuery.build(), this.getQueryWrapper(req));
-        return this.getVoPage(result);
+        return TableDataInfo.build(this.getVoPage(result));
     }
 
     /**
@@ -262,9 +260,6 @@ public class BusProjectTeamMemberServiceImpl extends ServiceImpl<BusProjectTeamM
         String memberName = req.getMemberName();
         String postId = req.getPostId();
         String remark = req.getRemark();
-        String sortField = req.getSortField();
-        String sortOrder = req.getSortOrder();
-        String underlineSortField = StrUtil.toUnderlineCase(sortField);
         // 联表查询
         if (StringUtils.isNotBlank(memberName)) {
             QueryWrapper<BusConstructionUser> constructionUserQueryWrapper = new QueryWrapper<>();
@@ -281,10 +276,6 @@ public class BusProjectTeamMemberServiceImpl extends ServiceImpl<BusProjectTeamM
         queryWrapper.eq(ObjectUtils.isNotEmpty(teamId), "team_id", teamId);
         queryWrapper.eq(ObjectUtils.isNotEmpty(memberId), "member_id", memberId);
         queryWrapper.eq(ObjectUtils.isNotEmpty(postId), "post_id", postId);
-        // 排序规则
-        queryWrapper.orderBy(SqlUtil.validSortField(sortField),
-            sortOrder.equals(CommonConstant.SORT_ORDER_ASC),
-            underlineSortField);
         return queryWrapper;
     }
 

RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamServiceImpl.java

@@ -1,18 +1,17 @@
 package org.dromara.project.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import jakarta.annotation.Resource;
-import org.dromara.common.core.constant.CommonConstant;
 import org.dromara.common.core.constant.HttpStatus;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.ObjectUtils;
 import org.dromara.common.core.utils.StringUtils;
-import org.dromara.common.core.utils.sql.SqlUtil;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.project.domain.BusProjectTeam;
 import org.dromara.project.domain.req.projectteam.ProjectTeamCreateReq;
@@ -60,16 +59,15 @@ public class BusProjectTeamServiceImpl extends ServiceImpl<BusProjectTeamMapper,
     /**
      * 分页查询项目班组列表
      *
-     * @param req 查询条件
+     * @param req       查询条件
+     * @param pageQuery 分页参数
      * @return 项目班组分页列表
      */
     @Override
-    public Page<BusProjectTeamVo> queryPageList(ProjectTeamQueryReq req) {
+    public TableDataInfo<BusProjectTeamVo> queryPageList(ProjectTeamQueryReq req, PageQuery pageQuery) {
-        long current = req.getCurrent();
-        long size = req.getPageSize();
         // 查询数据库
-        Page<BusProjectTeam> result = this.page(new Page<>(current, size), this.getQueryWrapper(req));
+        Page<BusProjectTeam> result = this.page(pageQuery.build(), this.getQueryWrapper(req));
-        return this.getVoPage(result);
+        return TableDataInfo.build(this.getVoPage(result));
     }
 
     /**
@@ -217,9 +215,6 @@ public class BusProjectTeamServiceImpl extends ServiceImpl<BusProjectTeamMapper,
         String teamName = req.getTeamName();
         String isClockIn = req.getIsClockIn();
         String remark = req.getRemark();
-        String sortField = req.getSortField();
-        String sortOrder = req.getSortOrder();
-        String underlineSortField = StrUtil.toUnderlineCase(sortField);
         // 模糊查询
         queryWrapper.like(StringUtils.isNotBlank(teamName), "team_name", teamName);
         queryWrapper.like(StringUtils.isNotBlank(remark), "remark", remark);
@@ -227,10 +222,6 @@ public class BusProjectTeamServiceImpl extends ServiceImpl<BusProjectTeamMapper,
         queryWrapper.eq(ObjectUtils.isNotEmpty(id), "id", id);
         queryWrapper.eq(ObjectUtils.isNotEmpty(projectId), "project_id", projectId);
         queryWrapper.eq(ObjectUtils.isNotEmpty(isClockIn), "is_clock_in", isClockIn);
-        // 排序规则
-        queryWrapper.orderBy(SqlUtil.validSortField(sortField),
-            sortOrder.equals(CommonConstant.SORT_ORDER_ASC),
-            underlineSortField);
         return queryWrapper;
     }
 

RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusUserProjectRelevancyServiceImpl.java

@@ -1,18 +1,17 @@
 package org.dromara.project.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import jakarta.annotation.Resource;
-import org.dromara.common.core.constant.CommonConstant;
 import org.dromara.common.core.constant.HttpStatus;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.ObjectUtils;
-import org.dromara.common.core.utils.sql.SqlUtil;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.project.domain.BusProject;
 import org.dromara.project.domain.BusUserProjectRelevancy;
@@ -71,17 +70,15 @@ public class BusUserProjectRelevancyServiceImpl extends ServiceImpl<BusUserProje
     /**
      * 分页查询系统用户与项目关联列表
      *
-     * @param req 查询条件
+     * @param req       查询条件
+     * @param pageQuery 分页参数
      * @return 系统用户与项目关联分页列表
      */
     @Override
-    public Page<BusUserProjectRelevancyVo> queryPageList(UserProjectRelevancyQueryReq req) {
+    public TableDataInfo<BusUserProjectRelevancyVo> queryPageList(UserProjectRelevancyQueryReq req, PageQuery pageQuery) {
-        long current = req.getCurrent();
-        long size = req.getPageSize();
-        QueryWrapper<BusUserProjectRelevancy> queryWrapper = this.getQueryWrapper(req);
         // 查询数据库
-        Page<BusUserProjectRelevancy> result = this.page(new Page<>(current, size), queryWrapper);
+        Page<BusUserProjectRelevancy> result = this.page(pageQuery.build(), this.getQueryWrapper(req));
-        return this.getVoPage(result);
+        return TableDataInfo.build(this.getVoPage(result));
     }
 
     /**
@@ -234,20 +231,20 @@ public class BusUserProjectRelevancyServiceImpl extends ServiceImpl<BusUserProje
     /**
      * 获取当前登录用户项目分页
      *
-     * @param userId 登录用户ID
+     * @param userId    登录用户ID
-     * @param req    分页查询条件
+     * @param req       分页查询条件
+     * @param pageQuery 分页查询条件
      * @return 当前登录用户项目分页
      */
     @Override
-    public Page<BusUserProjectRelevancyVo> queryPageByUserId(Long userId, UserProjectRelevancyQueryReq req) {
+    public TableDataInfo<BusUserProjectRelevancyVo> queryPageByUserId(Long userId, UserProjectRelevancyQueryReq req,
-        long current = req.getCurrent();
+                                                                      PageQuery pageQuery) {
-        long size = req.getPageSize();
         // 添加查询条件
         req.setUserId(userId);
         QueryWrapper<BusUserProjectRelevancy> queryWrapper = this.getQueryWrapper(req);
         // 查询数据库
-        Page<BusUserProjectRelevancy> result = this.page(new Page<>(current, size), queryWrapper);
+        Page<BusUserProjectRelevancy> result = this.page(pageQuery.build(), queryWrapper);
-        return this.getVoPage(result);
+        return TableDataInfo.build(this.getVoPage(result));
     }
 
     /**
@@ -325,17 +322,10 @@ public class BusUserProjectRelevancyServiceImpl extends ServiceImpl<BusUserProje
         Long id = req.getId();
         Long userId = req.getUserId();
         Long projectId = req.getProjectId();
-        String sortField = req.getSortField();
-        String sortOrder = req.getSortOrder();
-        String underlineSortField = StrUtil.toUnderlineCase(sortField);
         // 精确查询
         queryWrapper.eq(ObjectUtils.isNotEmpty(id), "id", id);
         queryWrapper.eq(ObjectUtils.isNotEmpty(userId), "user_id", userId);
         queryWrapper.eq(ObjectUtils.isNotEmpty(projectId), "project_id", projectId);
-        // 排序规则
-        queryWrapper.orderBy(SqlUtil.validSortField(sortField),
-            sortOrder.equals(CommonConstant.SORT_ORDER_ASC),
-            underlineSortField);
         return queryWrapper;
     }