diff --git a/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/common/PageRequest.java b/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/common/PageRequest.java deleted file mode 100644 index b79da1cb..00000000 --- a/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/common/PageRequest.java +++ /dev/null @@ -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; -} diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/controller/BusMachineryController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/controller/BusMachineryController.java index 15da011f..5ea13138 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/controller/BusMachineryController.java +++ b/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> list(MachineryQueryReq req) { - return R.ok(busMachineryService.queryPageList(req)); + public TableDataInfo list(MachineryQueryReq req, PageQuery pageQuery) { + return busMachineryService.queryPageList(req, pageQuery); } /** diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/controller/BusMachineryDetailController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/controller/BusMachineryDetailController.java index 4aab205d..a39fc8f4 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/controller/BusMachineryDetailController.java +++ b/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> list(MachineryDetailQueryReq req) { - return R.ok(busMachineryDetailService.queryPageList(req)); + public TableDataInfo list(MachineryDetailQueryReq req, PageQuery pageQuery) { + return busMachineryDetailService.queryPageList(req, pageQuery); } /** diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinery/MachineryQueryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinery/MachineryQueryReq.java index 38f7e24f..f6a9023f 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinery/MachineryQueryReq.java +++ b/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; diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinerydetail/MachineryDetailQueryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinerydetail/MachineryDetailQueryReq.java index 9a984540..e1b93bf7 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinerydetail/MachineryDetailQueryReq.java +++ b/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; diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/IBusMachineryDetailService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/IBusMachineryDetailService.java index 8a82a2fb..492250d3 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/IBusMachineryDetailService.java +++ b/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 /** * 分页查询机械详情列表 * - * @param req 查询条件 + * @param req 查询条件 + * @param pageQuery 分页参数 * @return 机械详情分页列表 */ - Page queryPageList(MachineryDetailQueryReq req); + TableDataInfo queryPageList(MachineryDetailQueryReq req, PageQuery pageQuery); /** * 查询符合条件的机械详情列表 diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/IBusMachineryService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/IBusMachineryService.java index af765f49..683414bd 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/IBusMachineryService.java +++ b/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 { /** * 分页查询机械列表 * - * @param req 查询条件 + * @param req 查询条件 + * @param pageQuery 分页条件 * @return 机械分页列表 */ - Page queryPageList(MachineryQueryReq req); + TableDataInfo queryPageList(MachineryQueryReq req, PageQuery pageQuery); /** * 查询符合条件的机械列表 diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/impl/BusMachineryDetailServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/impl/BusMachineryDetailServiceImpl.java index 0740f580..d15c7039 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/impl/BusMachineryDetailServiceImpl.java +++ b/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 queryPageList(MachineryDetailQueryReq req) { - long current = req.getCurrent(); - long size = req.getPageSize(); + public TableDataInfo queryPageList(MachineryDetailQueryReq req, PageQuery pageQuery) { // 查询数据库 - Page result = this.page(new Page<>(current, size), this.getQueryWrapper(req)); - return this.getVoPage(result); + Page result = this.page(pageQuery.build(), this.getQueryWrapper(req)); + return TableDataInfo.build(this.getVoPage(result)); } /** @@ -231,9 +229,6 @@ public class BusMachineryDetailServiceImpl extends ServiceImpl queryPageList(MachineryQueryReq req) { - long current = req.getCurrent(); - long size = req.getPageSize(); + public TableDataInfo queryPageList(MachineryQueryReq req, PageQuery pageQuery) { // 查询数据库 - Page result = this.page(new Page<>(current, size), this.getQueryWrapper(req)); - return this.getVoPage(result); + Page result = this.page(pageQuery.build(), this.getQueryWrapper(req)); + return TableDataInfo.build(this.getVoPage(result)); } /** @@ -223,9 +222,6 @@ public class BusMachineryServiceImpl extends ServiceImpl> list(CompanyQueryReq req) { - return R.ok(busCompanyService.queryPageList(req)); + public TableDataInfo list(CompanyQueryReq req, PageQuery pageQuery) { + return busCompanyService.queryPageList(req, pageQuery); } /** diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/BusMaterialsController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/BusMaterialsController.java index 645f3d8a..b7f1118f 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/BusMaterialsController.java +++ b/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> list(MaterialsQueryReq req) { - return R.ok(busMaterialsService.queryPageList(req)); + public TableDataInfo list(MaterialsQueryReq req, PageQuery pageQuery) { + return busMaterialsService.queryPageList(req, pageQuery); } /** diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/BusMaterialsInventoryController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/BusMaterialsInventoryController.java index 62ca3367..a7f0d8f4 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/BusMaterialsInventoryController.java +++ b/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> list(MaterialsInventoryQueryReq req) { - return R.ok(busMaterialsInventoryService.queryPageList(req)); + public TableDataInfo list(MaterialsInventoryQueryReq req, PageQuery pageQuery) { + return busMaterialsInventoryService.queryPageList(req, pageQuery); } /** diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/company/CompanyQueryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/company/CompanyQueryReq.java index fd356c76..de8461f8 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/company/CompanyQueryReq.java +++ b/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; diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MaterialsQueryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MaterialsQueryReq.java index 91515a7d..82f9cedd 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MaterialsQueryReq.java +++ b/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; diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materialsinventory/MaterialsInventoryQueryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materialsinventory/MaterialsInventoryQueryReq.java index f2a7279d..afe82625 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materialsinventory/MaterialsInventoryQueryReq.java +++ b/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; diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IBusCompanyService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IBusCompanyService.java index 368e4207..663df50a 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IBusCompanyService.java +++ b/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 { /** * 分页查询公司列表 * - * @param req 查询条件 + * @param req 查询条件 + * @param pageQuery 分页条件 * @return 公司分页列表 */ - Page queryPageList(CompanyQueryReq req); + TableDataInfo queryPageList(CompanyQueryReq req, PageQuery pageQuery); /** * 查询符合条件的公司列表 diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IBusMaterialsInventoryService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IBusMaterialsInventoryService.java index 24163e61..60026a78 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IBusMaterialsInventoryService.java +++ b/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 queryPageList(MaterialsInventoryQueryReq req); + TableDataInfo queryPageList(MaterialsInventoryQueryReq req, PageQuery pageQuery); /** * 查询符合条件的材料出/入库列表 diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IBusMaterialsService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IBusMaterialsService.java index 74c0a0d7..03a24014 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IBusMaterialsService.java +++ b/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 { /** * 分页查询材料名称列表 * - * @param req 查询条件 + * @param req 查询条件 + * @param pageQuery 分页条件 * @return 材料名称分页列表 */ - Page queryPageList(MaterialsQueryReq req); + TableDataInfo queryPageList(MaterialsQueryReq req, PageQuery pageQuery); /** * 查询符合条件的材料名称列表 diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/BusCompanyServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/BusCompanyServiceImpl.java index 77e4aa9f..be0d62c1 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/BusCompanyServiceImpl.java +++ b/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 queryPageList(CompanyQueryReq req) { - long current = req.getCurrent(); - long size = req.getPageSize(); + public TableDataInfo queryPageList(CompanyQueryReq req, PageQuery pageQuery) { // 查询数据库 - Page result = this.page(new Page<>(current, size), this.getQueryWrapper(req)); - return this.getCompanyVoPage(result); + Page result = this.page(pageQuery.build(), this.getQueryWrapper(req)); + return TableDataInfo.build(this.getCompanyVoPage(result)); } /** @@ -208,9 +206,6 @@ public class BusCompanyServiceImpl extends ServiceImpl queryPageList(MaterialsInventoryQueryReq req) { - long current = req.getCurrent(); - long size = req.getPageSize(); + public TableDataInfo queryPageList(MaterialsInventoryQueryReq req, PageQuery pageQuery) { // 查询数据库 - Page result = this.page(new Page<>(current, size), this.getQueryWrapper(req)); - return this.getVoPage(result); + Page result = this.page(pageQuery.build(), this.getQueryWrapper(req)); + return TableDataInfo.build(this.getVoPage(result)); } /** @@ -233,9 +230,6 @@ public class BusMaterialsInventoryServiceImpl extends ServiceImpl materialsQueryWrapper = new QueryWrapper<>(); @@ -258,10 +252,6 @@ public class BusMaterialsInventoryServiceImpl extends ServiceImpl queryPageList(MaterialsQueryReq req) { - long current = req.getCurrent(); - long size = req.getPageSize(); + public TableDataInfo queryPageList(MaterialsQueryReq req, PageQuery pageQuery) { // 查询数据库 - Page result = this.page(new Page<>(current, size), this.getQueryWrapper(req)); - return this.getMaterialsVoPage(result); + Page result = this.page(pageQuery.build(), this.getQueryWrapper(req)); + return TableDataInfo.build(this.getMaterialsVoPage(result)); } /** @@ -264,9 +262,6 @@ public class BusMaterialsServiceImpl extends ServiceImpl> list(ConstructionUserQueryReq req) { - return R.ok(busConstructionUserService.queryPageList(req)); + public TableDataInfo list(ConstructionUserQueryReq req, PageQuery pageQuery) { + return busConstructionUserService.queryPageList(req, pageQuery); } /** diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusContractorController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusContractorController.java index 96abf89b..a22f58f0 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusContractorController.java +++ b/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> list(ContractorQueryReq req) { - return R.ok(busContractorService.queryPageList(req)); + public TableDataInfo list(ContractorQueryReq req, PageQuery pageQuery) { + return busContractorService.queryPageList(req, pageQuery); } /** diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectController.java index 041e4343..e8fc28c0 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectController.java +++ b/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> list(ProjectQueryReq req) { - return R.ok(projectService.queryPageList(req)); + public TableDataInfo list(ProjectQueryReq req, PageQuery pageQuery) { + return projectService.queryPageList(req, pageQuery); } /** @@ -68,7 +69,7 @@ public class BusProjectController extends BaseController { @SaCheckPermission("project:project:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long id) { + @PathVariable Long id) { return R.ok(projectService.queryById(id)); } diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectTeamController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectTeamController.java index 6a2da4ff..367d449b 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectTeamController.java +++ b/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> list(ProjectTeamQueryReq req) { - return R.ok(busProjectTeamService.queryPageList(req)); + public TableDataInfo list(ProjectTeamQueryReq req, PageQuery pageQuery) { + return busProjectTeamService.queryPageList(req, pageQuery); } /** diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectTeamMemberController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectTeamMemberController.java index c596ea01..c8feb540 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectTeamMemberController.java +++ b/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> list(ProjectTeamMemberQueryReq req) { - return R.ok(busProjectTeamMemberService.queryPageList(req)); + public TableDataInfo list(ProjectTeamMemberQueryReq req, PageQuery pageQuery) { + return busProjectTeamMemberService.queryPageList(req, pageQuery); } /** diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusUserProjectRelevancyController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusUserProjectRelevancyController.java index f5af6e10..fb0e4a99 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusUserProjectRelevancyController.java +++ b/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> list(UserProjectRelevancyQueryReq req) { - return R.ok(userProjectRelevancyService.queryPageList(req)); + public TableDataInfo list(UserProjectRelevancyQueryReq req, PageQuery pageQuery) { + return userProjectRelevancyService.queryPageList(req, pageQuery); } /** @@ -68,9 +68,9 @@ public class BusUserProjectRelevancyController extends BaseController { */ @SaCheckPermission("project:projectRelevancy:list") @GetMapping("/login/page") - public R> pageByLoginUser(UserProjectRelevancyQueryReq req) { + public TableDataInfo pageByLoginUser(UserProjectRelevancyQueryReq req, PageQuery pageQuery) { Long userId = LoginHelper.getUserId(); - return R.ok(userProjectRelevancyService.queryPageByUserId(userId, req)); + return userProjectRelevancyService.queryPageByUserId(userId, req, pageQuery); } /** diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/ConstructionUserQueryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/ConstructionUserQueryReq.java index 1aba9c9f..62e96ac0 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/ConstructionUserQueryReq.java +++ b/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; diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/contractor/ContractorQueryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/contractor/ContractorQueryReq.java index c341eead..5127f094 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/contractor/ContractorQueryReq.java +++ b/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; diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/project/ProjectQueryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/project/ProjectQueryReq.java index 00e78582..136f0171 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/project/ProjectQueryReq.java +++ b/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; diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteam/ProjectTeamQueryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteam/ProjectTeamQueryReq.java index 944a8faa..6b866f1e 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteam/ProjectTeamQueryReq.java +++ b/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; diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteammember/ProjectTeamMemberQueryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteammember/ProjectTeamMemberQueryReq.java index b622d55b..44f8d186 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteammember/ProjectTeamMemberQueryReq.java +++ b/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; diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/userprojectrelevancy/UserProjectRelevancyQueryReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/userprojectrelevancy/UserProjectRelevancyQueryReq.java index 609d9a1f..3f0b81fc 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/userprojectrelevancy/UserProjectRelevancyQueryReq.java +++ b/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; diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusConstructionUserService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusConstructionUserService.java index 8c0abb76..b5a8fc44 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusConstructionUserService.java +++ b/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 queryPageList(ConstructionUserQueryReq req); + TableDataInfo queryPageList(ConstructionUserQueryReq req, PageQuery pageQuery); /** * 查询符合条件的施工人员列表 diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusContractorService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusContractorService.java index 0c9f758b..0f8a5d2b 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusContractorService.java +++ b/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 { /** * 分页查询分包单位列表 * - * @param req 查询条件 + * @param req 查询条件 + * @param pageQuery 分页参数 * @return 分包单位分页列表 */ - Page queryPageList(ContractorQueryReq req); + TableDataInfo queryPageList(ContractorQueryReq req, PageQuery pageQuery); /** * 查询符合条件的分包单位列表 diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectService.java index 6eb029b0..0c6673ac 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectService.java +++ b/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 { /** * 分页查询项目列表 * - * @param req 查询条件 + * @param req 查询条件 + * @param pageQuery 分页参数 * @return 项目分页列表 */ - Page queryPageList(ProjectQueryReq req); + TableDataInfo queryPageList(ProjectQueryReq req, PageQuery pageQuery); /** * 查询符合条件的项目列表 diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectTeamMemberService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectTeamMemberService.java index 733e117c..fb4997c5 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectTeamMemberService.java +++ b/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 queryPageList(ProjectTeamMemberQueryReq req); + TableDataInfo queryPageList(ProjectTeamMemberQueryReq req, PageQuery pageQuery); /** * 查询符合条件的项目班组下的成员列表 diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectTeamService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectTeamService.java index df82a784..2a225dc9 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectTeamService.java +++ b/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 { /** * 分页查询项目班组列表 * - * @param req 查询条件 + * @param req 查询条件 + * @param pageQuery 分页参数 * @return 项目班组分页列表 */ - Page queryPageList(ProjectTeamQueryReq req); + TableDataInfo queryPageList(ProjectTeamQueryReq req, PageQuery pageQuery); /** * 查询符合条件的项目班组列表 diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusUserProjectRelevancyService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusUserProjectRelevancyService.java index 42b2c3e5..de46fb71 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusUserProjectRelevancyService.java +++ b/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 queryPageList(UserProjectRelevancyQueryReq req); + TableDataInfo queryPageList(UserProjectRelevancyQueryReq req, PageQuery pageQuery); /** * 查询符合条件的系统用户与项目关联列表 @@ -82,11 +85,12 @@ public interface IBusUserProjectRelevancyService extends IService queryPageByUserId(Long userId, UserProjectRelevancyQueryReq req); + TableDataInfo queryPageByUserId(Long userId, UserProjectRelevancyQueryReq req, PageQuery pageQuery); /** * 批量新增用户和项目关联 diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionUserServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionUserServiceImpl.java index f8be7660..a6802490 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionUserServiceImpl.java +++ b/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 queryPageList(ConstructionUserQueryReq req) { - long current = req.getCurrent(); - long size = req.getPageSize(); + public TableDataInfo queryPageList(ConstructionUserQueryReq req, PageQuery pageQuery) { // 查询数据库 - Page result = this.page(new Page<>(current, size), this.getQueryWrapper(req)); - return this.getVoPage(result); + Page result = this.page(pageQuery.build(), this.getQueryWrapper(req)); + return TableDataInfo.build(getVoPage(result)); } /** @@ -274,9 +272,6 @@ public class BusConstructionUserServiceImpl extends ServiceImpl queryPageList(ContractorQueryReq req) { - long current = req.getCurrent(); - long size = req.getPageSize(); + public TableDataInfo queryPageList(ContractorQueryReq req, PageQuery pageQuery) { // 查询数据库 - Page result = this.page(new Page<>(current, size), this.getQueryWrapper(req)); - return this.getVoPage(result); + Page result = this.page(pageQuery.build(), this.getQueryWrapper(req)); + return TableDataInfo.build(this.getVoPage(result)); } /** @@ -237,9 +235,6 @@ public class BusContractorServiceImpl extends ServiceImpl queryPageList(ProjectQueryReq req) { - long current = req.getCurrent(); - long size = req.getPageSize(); + public TableDataInfo queryPageList(ProjectQueryReq req, PageQuery pageQuery) { // 查询数据库 - Page result = this.page(new Page<>(current, size), this.getQueryWrapper(req)); - return this.getVoPage(result); + Page result = this.page(pageQuery.build(), this.getQueryWrapper(req)); + return TableDataInfo.build(this.getVoPage(result)); } /** @@ -95,6 +94,7 @@ public class BusProjectServiceImpl extends ServiceImpl userIdList = List.of(userId, SystemConstants.SUPER_ADMIN_ID); + List userProjectRelevancyList = userIdList.stream().map(id -> { + BusUserProjectRelevancy userProjectRelevancy = new BusUserProjectRelevancy(); + 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 queryPageList(ProjectTeamMemberQueryReq req) { - long current = req.getCurrent(); - long size = req.getPageSize(); + public TableDataInfo queryPageList(ProjectTeamMemberQueryReq req, PageQuery pageQuery) { // 查询数据库 - Page result = this.page(new Page<>(current, size), this.getQueryWrapper(req)); - return this.getVoPage(result); + Page result = this.page(pageQuery.build(), this.getQueryWrapper(req)); + return TableDataInfo.build(this.getVoPage(result)); } /** @@ -262,9 +260,6 @@ public class BusProjectTeamMemberServiceImpl extends ServiceImpl constructionUserQueryWrapper = new QueryWrapper<>(); @@ -281,10 +276,6 @@ public class BusProjectTeamMemberServiceImpl extends ServiceImpl queryPageList(ProjectTeamQueryReq req) { - long current = req.getCurrent(); - long size = req.getPageSize(); + public TableDataInfo queryPageList(ProjectTeamQueryReq req, PageQuery pageQuery) { // 查询数据库 - Page result = this.page(new Page<>(current, size), this.getQueryWrapper(req)); - return this.getVoPage(result); + Page result = this.page(pageQuery.build(), this.getQueryWrapper(req)); + return TableDataInfo.build(this.getVoPage(result)); } /** @@ -217,9 +215,6 @@ public class BusProjectTeamServiceImpl extends ServiceImpl queryPageList(UserProjectRelevancyQueryReq req) { - long current = req.getCurrent(); - long size = req.getPageSize(); - QueryWrapper queryWrapper = this.getQueryWrapper(req); + public TableDataInfo queryPageList(UserProjectRelevancyQueryReq req, PageQuery pageQuery) { // 查询数据库 - Page result = this.page(new Page<>(current, size), queryWrapper); - return this.getVoPage(result); + Page result = this.page(pageQuery.build(), this.getQueryWrapper(req)); + return TableDataInfo.build(this.getVoPage(result)); } /** @@ -234,20 +231,20 @@ public class BusUserProjectRelevancyServiceImpl extends ServiceImpl queryPageByUserId(Long userId, UserProjectRelevancyQueryReq req) { - long current = req.getCurrent(); - long size = req.getPageSize(); + public TableDataInfo queryPageByUserId(Long userId, UserProjectRelevancyQueryReq req, + PageQuery pageQuery) { // 添加查询条件 req.setUserId(userId); QueryWrapper queryWrapper = this.getQueryWrapper(req); // 查询数据库 - Page result = this.page(new Page<>(current, size), queryWrapper); - return this.getVoPage(result); + Page result = this.page(pageQuery.build(), queryWrapper); + return TableDataInfo.build(this.getVoPage(result)); } /** @@ -325,17 +322,10 @@ public class BusUserProjectRelevancyServiceImpl extends ServiceImpl