From 13aae275797cbf4101aacccba59459c39036de85 Mon Sep 17 00:00:00 2001 From: YueYe <768242801@qq.com> Date: Tue, 17 Mar 2026 11:15:55 +0000 Subject: [PATCH] =?UTF-8?q?!837=20[mod]=E5=88=86=E9=A1=B5=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3=E4=BD=BF=E7=94=A8R=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E8=BF=94=E5=9B=9E=EF=BC=9A=E6=95=B0=E6=8D=AE=E6=94=BE?= =?UTF-8?q?=E5=85=A5data=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [mod]将PageResult从common-mybatis挪到common-core中 * [mod]TableDataInfo修改为PageResult * [mod]分页查询接口使用R类型返回：数据放入data中 --- .../common/core/domain/PageResult.java | 70 ++++++++++++ .../mybatis/core/page/TableDataInfo.java | 107 ------------------ .../demo/controller/TestDemoController.java | 10 +- .../demo/service/ITestDemoService.java | 6 +- .../service/impl/TestDemoServiceImpl.java | 10 +- .../generator/controller/GenController.java | 14 +-- .../service/GenTableServiceImpl.java | 18 ++- .../generator/service/IGenTableService.java | 6 +- .../main/resources/vm/java/controller.java.vm | 6 +- .../main/resources/vm/java/service.java.vm | 4 +- .../resources/vm/java/serviceImpl.java.vm | 6 +- .../src/main/resources/vm/ts/api.ts.vm | 3 +- .../src/main/resources/vm/vue/index.vue.vm | 4 +- .../monitor/SysLoginInfoController.java | 6 +- .../monitor/SysOperlogController.java | 6 +- .../monitor/SysUserOnlineController.java | 10 +- .../system/SysClientController.java | 6 +- .../system/SysConfigController.java | 6 +- .../system/SysDictDataController.java | 6 +- .../system/SysDictTypeController.java | 6 +- .../system/SysNoticeController.java | 6 +- .../system/SysOssConfigController.java | 6 +- .../controller/system/SysOssController.java | 6 +- .../controller/system/SysPostController.java | 6 +- .../controller/system/SysRoleController.java | 14 +-- .../controller/system/SysUserController.java | 6 +- .../system/service/ISysClientService.java | 4 +- .../system/service/ISysConfigService.java | 4 +- .../system/service/ISysDeptService.java | 4 +- .../system/service/ISysDictDataService.java | 4 +- .../system/service/ISysDictTypeService.java | 4 +- .../system/service/ISysLoginInfoService.java | 4 +- .../system/service/ISysNoticeService.java | 4 +- .../system/service/ISysOperLogService.java | 4 +- .../system/service/ISysOssConfigService.java | 4 +- .../system/service/ISysOssService.java | 4 +- .../system/service/ISysPostService.java | 4 +- .../system/service/ISysRoleService.java | 4 +- .../system/service/ISysUserService.java | 8 +- .../service/impl/SysClientServiceImpl.java | 6 +- .../service/impl/SysConfigServiceImpl.java | 6 +- .../service/impl/SysDeptServiceImpl.java | 6 +- .../service/impl/SysDictDataServiceImpl.java | 6 +- .../service/impl/SysDictTypeServiceImpl.java | 6 +- .../service/impl/SysLoginInfoServiceImpl.java | 6 +- .../service/impl/SysNoticeServiceImpl.java | 6 +- .../service/impl/SysOperLogServiceImpl.java | 6 +- .../service/impl/SysOssConfigServiceImpl.java | 6 +- .../service/impl/SysOssServiceImpl.java | 6 +- .../service/impl/SysPostServiceImpl.java | 6 +- .../service/impl/SysRoleServiceImpl.java | 6 +- .../impl/SysTaskAssigneeServiceImpl.java | 10 +- .../service/impl/SysUserServiceImpl.java | 15 ++- .../controller/FlwDefinitionController.java | 10 +- .../controller/FlwInstanceController.java | 14 +-- .../controller/FlwSpelController.java | 6 +- .../controller/FlwTaskController.java | 22 ++-- .../controller/TestLeaveController.java | 6 +- .../service/IFlwDefinitionService.java | 6 +- .../workflow/service/IFlwInstanceService.java | 8 +- .../workflow/service/IFlwSpelService.java | 4 +- .../workflow/service/IFlwTaskService.java | 12 +- .../workflow/service/ITestLeaveService.java | 4 +- .../impl/FlwDefinitionServiceImpl.java | 10 +- .../service/impl/FlwInstanceServiceImpl.java | 14 +-- .../service/impl/FlwSpelServiceImpl.java | 8 +- .../service/impl/FlwTaskServiceImpl.java | 22 ++-- .../service/impl/TestLeaveServiceImpl.java | 6 +- 68 files changed, 314 insertions(+), 345 deletions(-) create mode 100644 ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/PageResult.java delete mode 100644 ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/TableDataInfo.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/PageResult.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/PageResult.java new file mode 100644 index 000000000..dedc8b72b --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/PageResult.java @@ -0,0 +1,70 @@ +package org.dromara.common.core.domain; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serial; +import java.io.Serializable; +import java.util.List; + +/** + * 表格分页数据对象 + * + * @author Lion Li + */ +@Data +@NoArgsConstructor +public class PageResult implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 总记录数 + */ + private long total; + + /** + * 列表数据 + */ + private List rows; + + /** + * 分页 + * + * @param list 列表数据 + * @param total 总记录数 + */ + public PageResult(List list, long total) { + this.rows = list; + this.total = total; + } + + /** + * 根据分页对象构建表格分页数据对象 + */ + public static PageResult build(List list, long total) { + PageResult rspData = new PageResult<>(); + rspData.setRows(list); + rspData.setTotal(total); + return rspData; + } + + /** + * 根据数据列表构建表格分页数据对象 + */ + public static PageResult build(List list) { + PageResult rspData = new PageResult<>(); + rspData.setRows(list); + rspData.setTotal(list.size()); + return rspData; + } + + /** + * 构建表格分页数据对象 + */ + public static PageResult build() { + return new PageResult<>(); + } + +} diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/TableDataInfo.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/TableDataInfo.java deleted file mode 100644 index 1fe2b3ef1..000000000 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/TableDataInfo.java +++ /dev/null @@ -1,107 +0,0 @@ -package org.dromara.common.mybatis.core.page; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.http.HttpStatus; -import com.baomidou.mybatisplus.core.metadata.IPage; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serial; -import java.io.Serializable; -import java.util.List; - -/** - * 表格分页数据对象 - * - * @author Lion Li - */ -@Data -@NoArgsConstructor -public class TableDataInfo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 总记录数 - */ - private long total; - - /** - * 列表数据 - */ - private List rows; - - /** - * 消息状态码 - */ - private int code; - - /** - * 消息内容 - */ - private String msg; - - /** - * 分页 - * - * @param list 列表数据 - * @param total 总记录数 - */ - public TableDataInfo(List list, long total) { - this.rows = list; - this.total = total; - this.code = HttpStatus.HTTP_OK; - this.msg = "查询成功"; - } - - /** - * 根据分页对象构建表格分页数据对象 - */ - public static TableDataInfo build(IPage page) { - TableDataInfo rspData = new TableDataInfo<>(); - rspData.setCode(HttpStatus.HTTP_OK); - rspData.setMsg("查询成功"); - rspData.setRows(page.getRecords()); - rspData.setTotal(page.getTotal()); - return rspData; - } - - /** - * 根据数据列表构建表格分页数据对象 - */ - public static TableDataInfo build(List list) { - TableDataInfo rspData = new TableDataInfo<>(); - rspData.setCode(HttpStatus.HTTP_OK); - rspData.setMsg("查询成功"); - rspData.setRows(list); - rspData.setTotal(list.size()); - return rspData; - } - - /** - * 构建表格分页数据对象 - */ - public static TableDataInfo build() { - TableDataInfo rspData = new TableDataInfo<>(); - rspData.setCode(HttpStatus.HTTP_OK); - rspData.setMsg("查询成功"); - return rspData; - } - - /** - * 根据原始数据列表和分页参数，构建表格分页数据对象（用于假分页） - * - * @param list 原始数据列表（全部数据） - * @param page 分页参数对象（包含当前页码、每页大小等） - * @return 构造好的分页结果 TableDataInfo - */ - public static TableDataInfo build(List list, IPage page) { - if (CollUtil.isEmpty(list)) { - return TableDataInfo.build(); - } - List pageList = CollUtil.page((int) page.getCurrent() - 1, (int) page.getSize(), list); - return new TableDataInfo<>(pageList, list.size()); - } - -} diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestDemoController.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestDemoController.java index eca329c68..b91c4f80c 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestDemoController.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestDemoController.java @@ -10,7 +10,7 @@ import org.dromara.common.core.validate.QueryGroup; import org.dromara.common.web.core.BaseController; import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.excel.core.ExcelResult; import org.dromara.common.excel.utils.ExcelUtil; import org.dromara.common.log.annotation.Log; @@ -52,8 +52,8 @@ public class TestDemoController extends BaseController { */ @SaCheckPermission("demo:demo:list") @GetMapping("/list") - public TableDataInfo list(@Validated(QueryGroup.class) TestDemoBo bo, PageQuery pageQuery) { - return testDemoService.queryPageList(bo, pageQuery); + public R> list(@Validated(QueryGroup.class) TestDemoBo bo, PageQuery pageQuery) { + return R.ok(testDemoService.queryPageList(bo, pageQuery)); } /** @@ -61,8 +61,8 @@ public class TestDemoController extends BaseController { */ @SaCheckPermission("demo:demo:list") @GetMapping("/page") - public TableDataInfo page(@Validated(QueryGroup.class) TestDemoBo bo, PageQuery pageQuery) { - return testDemoService.customPageList(bo, pageQuery); + public R> page(@Validated(QueryGroup.class) TestDemoBo bo, PageQuery pageQuery) { + return R.ok(testDemoService.customPageList(bo, pageQuery)); } /** diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/ITestDemoService.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/ITestDemoService.java index 0b3160ebf..9575d12c2 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/ITestDemoService.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/ITestDemoService.java @@ -1,7 +1,7 @@ package org.dromara.demo.service; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.core.domain.PageResult; import org.dromara.demo.domain.TestDemo; import org.dromara.demo.domain.bo.TestDemoBo; import org.dromara.demo.domain.vo.TestDemoVo; @@ -32,7 +32,7 @@ public interface ITestDemoService { * @param pageQuery 分页参数 * @return 分页结果 */ - TableDataInfo queryPageList(TestDemoBo bo, PageQuery pageQuery); + PageResult queryPageList(TestDemoBo bo, PageQuery pageQuery); /** * 按自定义 SQL 分页查询测试单表列表。 @@ -41,7 +41,7 @@ public interface ITestDemoService { * @param pageQuery 分页参数 * @return 分页结果 */ - TableDataInfo customPageList(TestDemoBo bo, PageQuery pageQuery); + PageResult customPageList(TestDemoBo bo, PageQuery pageQuery); /** * 查询符合条件的测试单表列表。 diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java index e3404f2a6..5c4c29f68 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java @@ -8,7 +8,7 @@ import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.core.domain.PageResult; import org.dromara.demo.domain.TestDemo; import org.dromara.demo.domain.bo.TestDemoBo; import org.dromara.demo.domain.vo.TestDemoVo; @@ -51,10 +51,10 @@ public class TestDemoServiceImpl implements ITestDemoService { * @return 分页结果 */ @Override - public TableDataInfo queryPageList(TestDemoBo bo, PageQuery pageQuery) { + public PageResult queryPageList(TestDemoBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); - return TableDataInfo.build(result); + return PageResult.build(result.getRecords(), result.getTotal()); } /** @@ -65,10 +65,10 @@ public class TestDemoServiceImpl implements ITestDemoService { * @return 分页结果 */ @Override - public TableDataInfo customPageList(TestDemoBo bo, PageQuery pageQuery) { + public PageResult customPageList(TestDemoBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.customPageList(pageQuery.build(), lqw); - return TableDataInfo.build(result); + return PageResult.build(result.getRecords(), result.getTotal()); } /** diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/controller/GenController.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/controller/GenController.java index 1bb8f949c..d37248d24 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/controller/GenController.java +++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/controller/GenController.java @@ -11,7 +11,7 @@ import org.dromara.common.redis.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.core.domain.PageResult; import org.dromara.common.mybatis.helper.DataBaseHelper; import org.dromara.common.web.core.BaseController; import org.dromara.generator.domain.GenTable; @@ -47,8 +47,8 @@ public class GenController extends BaseController { */ @SaCheckPermission("tool:gen:list") @GetMapping("/list") - public TableDataInfo genList(GenTable genTable, PageQuery pageQuery) { - return genTableService.selectPageGenTableList(genTable, pageQuery); + public R> genList(GenTable genTable, PageQuery pageQuery) { + return R.ok(genTableService.selectPageGenTableList(genTable, pageQuery)); } /** @@ -80,8 +80,8 @@ public class GenController extends BaseController { */ @SaCheckPermission("tool:gen:list") @GetMapping("/db/list") - public TableDataInfo dataList(GenTable genTable, PageQuery pageQuery) { - return genTableService.selectPageDbTableList(genTable, pageQuery); + public R> dataList(GenTable genTable, PageQuery pageQuery) { + return R.ok(genTableService.selectPageDbTableList(genTable, pageQuery)); } /** @@ -92,9 +92,9 @@ public class GenController extends BaseController { */ @SaCheckPermission("tool:gen:list") @GetMapping(value = "/column/{tableId}") - public TableDataInfo columnList(@PathVariable("tableId") Long tableId) { + public R> columnList(@PathVariable("tableId") Long tableId) { List list = genTableService.selectGenTableColumnListByTableId(tableId); - return TableDataInfo.build(list); + return R.ok(PageResult.build(list)); } /** diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java index 422034d37..cd94cd250 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java +++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java @@ -26,7 +26,7 @@ import org.dromara.common.core.utils.StringUtils; import org.dromara.common.core.utils.file.FileUtils; 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.core.domain.PageResult; import org.dromara.common.mybatis.utils.IdGeneratorUtil; import org.dromara.generator.constant.GenConstants; import org.dromara.generator.domain.GenTable; @@ -97,9 +97,9 @@ public class GenTableServiceImpl implements IGenTableService { * @return 业务表分页结果 */ @Override - public TableDataInfo selectPageGenTableList(GenTable genTable, PageQuery pageQuery) { + public PageResult selectPageGenTableList(GenTable genTable, PageQuery pageQuery) { Page page = baseMapper.selectPage(pageQuery.build(), this.buildGenTableQueryWrapper(genTable)); - return TableDataInfo.build(page); + return PageResult.build(page.getRecords(), page.getTotal()); } /** @@ -130,14 +130,14 @@ public class GenTableServiceImpl implements IGenTableService { */ @DS("#genTable.dataName") @Override - public TableDataInfo selectPageDbTableList(GenTable genTable, PageQuery pageQuery) { + public PageResult selectPageDbTableList(GenTable genTable, PageQuery pageQuery) { // 获取查询条件 String tableName = genTable.getTableName(); String tableComment = genTable.getTableComment(); LinkedHashMap> tablesMap = ServiceProxy.metadata().tables(); if (CollUtil.isEmpty(tablesMap)) { - return TableDataInfo.build(); + return PageResult.build(); } List tableNames = baseMapper.selectTableNameList(genTable.getDataName()); String[] tableArrays; @@ -179,7 +179,13 @@ public class GenTableServiceImpl implements IGenTableService { return gen; }).sorted(Comparator.comparing(GenTable::getCreateTime).reversed()) .toList(); - return TableDataInfo.build(tables, pageQuery.build()); + // 根据原始数据列表和分页参数，构建表格分页数据对象（用于假分页） + if (CollUtil.isEmpty(tables)) { + return PageResult.build(); + } + Page page = pageQuery.build(); + List pageList = CollUtil.page((int) page.getCurrent() - 1, (int) page.getSize(), tables); + return PageResult.build(pageList, tables.size()); } /** diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/IGenTableService.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/IGenTableService.java index c336e05bb..18f03c977 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/IGenTableService.java +++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/IGenTableService.java @@ -1,7 +1,7 @@ package org.dromara.generator.service; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.core.domain.PageResult; import org.dromara.generator.domain.GenTable; import org.dromara.generator.domain.GenTableColumn; @@ -30,7 +30,7 @@ public interface IGenTableService { * @param pageQuery 分页参数 * @return 业务分页集合 */ - TableDataInfo selectPageGenTableList(GenTable genTable, PageQuery pageQuery); + PageResult selectPageGenTableList(GenTable genTable, PageQuery pageQuery); /** * 查询据库列表 @@ -39,7 +39,7 @@ public interface IGenTableService { * @param pageQuery 分页参数 * @return 数据库表分页集合 */ - TableDataInfo selectPageDbTableList(GenTable genTable, PageQuery pageQuery); + PageResult selectPageDbTableList(GenTable genTable, PageQuery pageQuery); /** * 查询据库列表 diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/controller.java.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/controller.java.vm index 64389717d..a43370e63 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/controller.java.vm +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/controller.java.vm @@ -21,7 +21,7 @@ import ${packageName}.domain.vo.${ClassName}Vo; import ${packageName}.domain.bo.${ClassName}Bo; import ${packageName}.service.I${ClassName}Service; #if($table.crud) -import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.core.domain.PageResult; #elseif($table.tree) #end @@ -45,8 +45,8 @@ public class ${ClassName}Controller extends BaseController { @SaCheckPermission("${permissionPrefix}:list") @GetMapping("/list") #if($table.crud) - public TableDataInfo<${ClassName}Vo> list(${ClassName}Bo bo, PageQuery pageQuery) { - return ${className}Service.queryPageList(bo, pageQuery); + public R> list(${ClassName}Bo bo, PageQuery pageQuery) { + return R.ok(${className}Service.queryPageList(bo, pageQuery)); } #elseif($table.tree) public R> list(${ClassName}Bo bo) { diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/service.java.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/service.java.vm index 4db903013..f3e18f435 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/service.java.vm +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/service.java.vm @@ -3,7 +3,7 @@ package ${packageName}.service; import ${packageName}.domain.vo.${ClassName}Vo; import ${packageName}.domain.bo.${ClassName}Bo; #if($table.crud) -import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.mybatis.core.page.PageQuery; #end @@ -34,7 +34,7 @@ public interface I${ClassName}Service { * @param pageQuery 分页参数 * @return ${functionName}分页列表 */ - TableDataInfo<${ClassName}Vo> queryPageList(${ClassName}Bo bo, PageQuery pageQuery); + PageResult<${ClassName}Vo> queryPageList(${ClassName}Bo bo, PageQuery pageQuery); #end /** diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm index be6c3bf7b..a92fb8758 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm @@ -3,7 +3,7 @@ package ${packageName}.service.impl; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; #if($table.crud) -import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.mybatis.core.page.PageQuery; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; #end @@ -55,10 +55,10 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service { * @return ${functionName}分页列表 */ @Override - public TableDataInfo<${ClassName}Vo> queryPageList(${ClassName}Bo bo, PageQuery pageQuery) { + public PageResult<${ClassName}Vo> queryPageList(${ClassName}Bo bo, PageQuery pageQuery) { LambdaQueryWrapper<${ClassName}> lqw = buildQueryWrapper(bo); Page<${ClassName}Vo> result = baseMapper.selectVoPage(pageQuery.build(), lqw); - return TableDataInfo.build(result); + return PageResult.build(result.getRecords(), result.getTotal()); } #end diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/ts/api.ts.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/ts/api.ts.vm index 3aa4a5f6d..a8f2230c8 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/ts/api.ts.vm +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/ts/api.ts.vm @@ -1,6 +1,7 @@ import request from '@/utils/request'; import { AxiosPromise } from 'axios'; import { ${BusinessName}VO, ${BusinessName}Form, ${BusinessName}Query } from '@/api/${moduleName}/${businessName}/types'; +import { PageResult } from '@/api/types'; /** * 查询${functionName}列表 @@ -8,7 +9,7 @@ import { ${BusinessName}VO, ${BusinessName}Form, ${BusinessName}Query } from '@/ * @returns {*} */ -export const list${BusinessName} = (query?: ${BusinessName}Query): AxiosPromise<${BusinessName}VO[]> => { +export const list${BusinessName} = (query?: ${BusinessName}Query): AxiosPromise> => { return request({ url: '/${moduleName}/${businessName}/list', method: 'get', diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm index 1e06d7ada..30a8dc1a7 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm @@ -351,8 +351,8 @@ const getList = async () => { #end #end const res = await list${BusinessName}(queryParams.value); - ${businessName}List.value = res.rows; - total.value = res.total; + ${businessName}List.value = res.data?.rows; + total.value = res.data?.total; loading.value = false; } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysLoginInfoController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysLoginInfoController.java index 6d9e4a60a..2db084ba9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysLoginInfoController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysLoginInfoController.java @@ -11,7 +11,7 @@ import org.dromara.common.redis.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.core.domain.PageResult; import org.dromara.common.redis.utils.RedisUtils; import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.bo.SysLoginInfoBo; @@ -44,8 +44,8 @@ public class SysLoginInfoController extends BaseController { */ @SaCheckPermission("monitor:logininfo:list") @GetMapping("/list") - public TableDataInfo list(SysLoginInfoBo loginInfo, PageQuery pageQuery) { - return loginInfoService.selectPageLoginInfoList(loginInfo, pageQuery); + public R> list(SysLoginInfoBo loginInfo, PageQuery pageQuery) { + return R.ok(loginInfoService.selectPageLoginInfoList(loginInfo, pageQuery)); } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java index 2bc6ff27b..2654dbf85 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java @@ -9,7 +9,7 @@ import org.dromara.common.excel.utils.ExcelUtil; 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.core.domain.PageResult; import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.bo.SysOperLogBo; import org.dromara.system.domain.vo.SysOperLogVo; @@ -41,8 +41,8 @@ public class SysOperlogController extends BaseController { */ @SaCheckPermission("monitor:operlog:list") @GetMapping("/list") - public TableDataInfo list(SysOperLogBo operLog, PageQuery pageQuery) { - return operLogService.selectPageOperLogList(operLog, pageQuery); + public R> list(SysOperLogBo operLog, PageQuery pageQuery) { + return R.ok(operLogService.selectPageOperLogList(operLog, pageQuery)); } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java index 898bc2ca9..47f2bb0dc 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java @@ -13,7 +13,7 @@ import org.dromara.common.core.utils.StringUtils; import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.redis.utils.RedisUtils; import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.SysUserOnline; @@ -44,7 +44,7 @@ public class SysUserOnlineController extends BaseController { */ @SaCheckPermission("monitor:online:list") @GetMapping("/list") - public TableDataInfo list(String ipaddr, String userName) { + public R> list(String ipaddr, String userName) { // 获取所有未过期的 token Collection keys = RedisUtils.keys(CacheConstants.ONLINE_TOKEN_KEY + "*"); List userOnlineDTOList = new ArrayList<>(); @@ -73,7 +73,7 @@ public class SysUserOnlineController extends BaseController { Collections.reverse(userOnlineDTOList); userOnlineDTOList.removeAll(Collections.singleton(null)); List userOnlineList = BeanUtil.copyToList(userOnlineDTOList, SysUserOnline.class); - return TableDataInfo.build(userOnlineList); + return R.ok(PageResult.build(userOnlineList)); } /** @@ -100,7 +100,7 @@ public class SysUserOnlineController extends BaseController { * @return 当前用户在线设备列表 */ @GetMapping() - public TableDataInfo getInfo() { + public R> getInfo() { // 获取指定账号 id 的 token 集合 List tokenIds = StpUtil.getTokenValueListByLoginId(StpUtil.getLoginIdAsString()); List userOnlineDTOList = tokenIds.stream() @@ -111,7 +111,7 @@ public class SysUserOnlineController extends BaseController { Collections.reverse(userOnlineDTOList); userOnlineDTOList.removeAll(Collections.singleton(null)); List userOnlineList = BeanUtil.copyToList(userOnlineDTOList, SysUserOnline.class); - return TableDataInfo.build(userOnlineList); + return R.ok(PageResult.build(userOnlineList)); } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysClientController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysClientController.java index c59504f57..83806b63a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysClientController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysClientController.java @@ -13,7 +13,7 @@ import org.dromara.common.redis.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.core.domain.PageResult; import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.bo.SysClientBo; import org.dromara.system.domain.vo.SysClientVo; @@ -46,8 +46,8 @@ public class SysClientController extends BaseController { */ @SaCheckPermission("system:client:list") @GetMapping("/list") - public TableDataInfo list(SysClientBo bo, PageQuery pageQuery) { - return sysClientService.queryPageList(bo, pageQuery); + public R> list(SysClientBo bo, PageQuery pageQuery) { + return R.ok(sysClientService.queryPageList(bo, pageQuery)); } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java index 57e549c2f..c424029e7 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java @@ -9,7 +9,7 @@ import org.dromara.common.redis.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.core.domain.PageResult; import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.bo.SysConfigBo; import org.dromara.system.domain.vo.SysConfigVo; @@ -42,8 +42,8 @@ public class SysConfigController extends BaseController { */ @SaCheckPermission("system:config:list") @GetMapping("/list") - public TableDataInfo list(SysConfigBo config, PageQuery pageQuery) { - return configService.selectPageConfigList(config, pageQuery); + public R> list(SysConfigBo config, PageQuery pageQuery) { + return R.ok(configService.selectPageConfigList(config, pageQuery)); } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java index d92c40a89..6de84099f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java @@ -10,7 +10,7 @@ import org.dromara.common.redis.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.core.domain.PageResult; import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.bo.SysDictDataBo; import org.dromara.system.domain.vo.SysDictDataVo; @@ -46,8 +46,8 @@ public class SysDictDataController extends BaseController { */ @SaCheckPermission("system:dict:list") @GetMapping("/list") - public TableDataInfo list(SysDictDataBo dictData, PageQuery pageQuery) { - return dictDataService.selectPageDictDataList(dictData, pageQuery); + public R> list(SysDictDataBo dictData, PageQuery pageQuery) { + return R.ok(dictDataService.selectPageDictDataList(dictData, pageQuery)); } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java index 4f91f5211..4d553cc6f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java @@ -10,7 +10,7 @@ import org.dromara.common.redis.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.core.domain.PageResult; import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.bo.SysDictTypeBo; import org.dromara.system.domain.vo.SysDictTypeVo; @@ -43,8 +43,8 @@ public class SysDictTypeController extends BaseController { */ @SaCheckPermission("system:dict:list") @GetMapping("/list") - public TableDataInfo list(SysDictTypeBo dictType, PageQuery pageQuery) { - return dictTypeService.selectPageDictTypeList(dictType, pageQuery); + public R> list(SysDictTypeBo dictType, PageQuery pageQuery) { + return R.ok(dictTypeService.selectPageDictTypeList(dictType, pageQuery)); } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java index 8a655e561..fcc3f459a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java @@ -8,7 +8,7 @@ import org.dromara.common.redis.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.core.domain.PageResult; import org.dromara.common.sse.utils.SseMessageUtils; import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.bo.SysNoticeBo; @@ -40,8 +40,8 @@ public class SysNoticeController extends BaseController { */ @SaCheckPermission("system:notice:list") @GetMapping("/list") - public TableDataInfo list(SysNoticeBo notice, PageQuery pageQuery) { - return noticeService.selectPageNoticeList(notice, pageQuery); + public R> list(SysNoticeBo notice, PageQuery pageQuery) { + return R.ok(noticeService.selectPageNoticeList(notice, pageQuery)); } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssConfigController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssConfigController.java index 6cba16386..6664cc610 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssConfigController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssConfigController.java @@ -10,7 +10,7 @@ import org.dromara.common.redis.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.core.domain.PageResult; import org.dromara.system.domain.bo.SysOssConfigBo; import org.dromara.system.domain.vo.SysOssConfigVo; import org.dromara.system.service.ISysOssConfigService; @@ -46,8 +46,8 @@ public class SysOssConfigController extends BaseController { */ @SaCheckPermission("system:ossConfig:list") @GetMapping("/list") - public TableDataInfo list(@Validated(QueryGroup.class) SysOssConfigBo bo, PageQuery pageQuery) { - return ossConfigService.queryPageList(bo, pageQuery); + public R> list(@Validated(QueryGroup.class) SysOssConfigBo bo, PageQuery pageQuery) { + return R.ok(ossConfigService.queryPageList(bo, pageQuery)); } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java index 82d8397a4..9fbf71e39 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java @@ -10,7 +10,7 @@ import org.dromara.common.core.validate.QueryGroup; 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.core.domain.PageResult; import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.bo.SysOssBo; import org.dromara.system.domain.vo.SysOssUploadVo; @@ -47,8 +47,8 @@ public class SysOssController extends BaseController { */ @SaCheckPermission("system:oss:list") @GetMapping("/list") - public TableDataInfo list(@Validated(QueryGroup.class) SysOssBo bo, PageQuery pageQuery) { - return ossService.queryPageList(bo, pageQuery); + public R> list(@Validated(QueryGroup.class) SysOssBo bo, PageQuery pageQuery) { + return R.ok(ossService.queryPageList(bo, pageQuery)); } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java index 43bd55389..7ac0253ee 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java @@ -12,7 +12,7 @@ import org.dromara.common.redis.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.core.domain.PageResult; import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.bo.SysDeptBo; import org.dromara.system.domain.bo.SysPostBo; @@ -49,8 +49,8 @@ public class SysPostController extends BaseController { */ @SaCheckPermission("system:post:list") @GetMapping("/list") - public TableDataInfo list(SysPostBo post, PageQuery pageQuery) { - return postService.selectPagePostList(post, pageQuery); + public R> list(SysPostBo post, PageQuery pageQuery) { + return R.ok(postService.selectPagePostList(post, pageQuery)); } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java index 17700be01..e247eceb0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java @@ -10,7 +10,7 @@ import org.dromara.common.redis.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.core.domain.PageResult; import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.SysUserRole; import org.dromara.system.domain.bo.SysDeptBo; @@ -50,8 +50,8 @@ public class SysRoleController extends BaseController { */ @SaCheckPermission("system:role:list") @GetMapping("/list") - public TableDataInfo list(SysRoleBo role, PageQuery pageQuery) { - return roleService.selectPageRoleList(role, pageQuery); + public R> list(SysRoleBo role, PageQuery pageQuery) { + return R.ok(roleService.selectPageRoleList(role, pageQuery)); } /** @@ -202,8 +202,8 @@ public class SysRoleController extends BaseController { */ @SaCheckPermission("system:role:list") @GetMapping("/authUser/allocatedList") - public TableDataInfo allocatedList(SysUserBo user, PageQuery pageQuery) { - return userService.selectAllocatedList(user, pageQuery); + public R> allocatedList(SysUserBo user, PageQuery pageQuery) { + return R.ok(userService.selectAllocatedList(user, pageQuery)); } /** @@ -215,8 +215,8 @@ public class SysRoleController extends BaseController { */ @SaCheckPermission("system:role:list") @GetMapping("/authUser/unallocatedList") - public TableDataInfo unallocatedList(SysUserBo user, PageQuery pageQuery) { - return userService.selectUnallocatedList(user, pageQuery); + public R> unallocatedList(SysUserBo user, PageQuery pageQuery) { + return R.ok(userService.selectUnallocatedList(user, pageQuery)); } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java index 466a4aec6..1349ab125 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java @@ -20,7 +20,7 @@ import org.dromara.common.redis.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.core.domain.PageResult; import org.dromara.common.mybatis.helper.DataPermissionHelper; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.common.web.core.BaseController; @@ -67,8 +67,8 @@ public class SysUserController extends BaseController { */ @SaCheckPermission("system:user:list") @GetMapping("/list") - public TableDataInfo list(SysUserBo user, PageQuery pageQuery) { - return userService.selectPageUserList(user, pageQuery); + public R> list(SysUserBo user, PageQuery pageQuery) { + return R.ok(userService.selectPageUserList(user, pageQuery)); } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysClientService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysClientService.java index 9e742fd36..b865c9c13 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysClientService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysClientService.java @@ -1,7 +1,7 @@ package org.dromara.system.service; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.core.domain.PageResult; import org.dromara.system.domain.bo.SysClientBo; import org.dromara.system.domain.vo.SysClientVo; @@ -29,7 +29,7 @@ public interface ISysClientService { /** * 查询客户端管理列表 */ - TableDataInfo queryPageList(SysClientBo bo, PageQuery pageQuery); + PageResult queryPageList(SysClientBo bo, PageQuery pageQuery); /** * 查询客户端管理列表 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysConfigService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysConfigService.java index baa5962df..1f19d2794 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysConfigService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysConfigService.java @@ -1,7 +1,7 @@ package org.dromara.system.service; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.core.domain.PageResult; import org.dromara.system.domain.bo.SysConfigBo; import org.dromara.system.domain.vo.SysConfigVo; @@ -21,7 +21,7 @@ public interface ISysConfigService { * @param pageQuery 分页参数 * @return 参数配置分页列表 */ - TableDataInfo selectPageConfigList(SysConfigBo config, PageQuery pageQuery); + PageResult selectPageConfigList(SysConfigBo config, PageQuery pageQuery); /** * 查询参数配置信息 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDeptService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDeptService.java index 1397443cb..63c33be1c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDeptService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDeptService.java @@ -2,7 +2,7 @@ package org.dromara.system.service; import cn.hutool.core.lang.tree.Tree; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.core.domain.PageResult; import org.dromara.system.domain.bo.SysDeptBo; import org.dromara.system.domain.vo.SysDeptVo; @@ -22,7 +22,7 @@ public interface ISysDeptService { * @param pageQuery 分页对象 * @return 部门信息集合 */ - TableDataInfo selectPageDeptList(SysDeptBo dept, PageQuery pageQuery); + PageResult selectPageDeptList(SysDeptBo dept, PageQuery pageQuery); /** * 查询部门管理数据 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictDataService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictDataService.java index fdabd3170..f3bd769ac 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictDataService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictDataService.java @@ -1,7 +1,7 @@ package org.dromara.system.service; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.core.domain.PageResult; import org.dromara.system.domain.bo.SysDictDataBo; import org.dromara.system.domain.vo.SysDictDataVo; @@ -21,7 +21,7 @@ public interface ISysDictDataService { * @param pageQuery 分页参数 * @return 字典数据分页列表 */ - TableDataInfo selectPageDictDataList(SysDictDataBo dictData, PageQuery pageQuery); + PageResult selectPageDictDataList(SysDictDataBo dictData, PageQuery pageQuery); /** * 根据条件分页查询字典数据 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictTypeService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictTypeService.java index e3a04def2..1eac2c429 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictTypeService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictTypeService.java @@ -1,7 +1,7 @@ package org.dromara.system.service; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.core.domain.PageResult; import org.dromara.system.domain.bo.SysDictTypeBo; import org.dromara.system.domain.vo.SysDictDataVo; import org.dromara.system.domain.vo.SysDictTypeVo; @@ -22,7 +22,7 @@ public interface ISysDictTypeService { * @param pageQuery 分页参数 * @return 字典类型分页列表 */ - TableDataInfo selectPageDictTypeList(SysDictTypeBo dictType, PageQuery pageQuery); + PageResult selectPageDictTypeList(SysDictTypeBo dictType, PageQuery pageQuery); /** * 根据条件分页查询字典类型 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysLoginInfoService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysLoginInfoService.java index af3845e5a..c3f0100b0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysLoginInfoService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysLoginInfoService.java @@ -1,7 +1,7 @@ package org.dromara.system.service; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.core.domain.PageResult; import org.dromara.system.domain.bo.SysLoginInfoBo; import org.dromara.system.domain.vo.SysLoginInfoVo; @@ -21,7 +21,7 @@ public interface ISysLoginInfoService { * @param pageQuery 分页参数 * @return 登录日志分页列表 */ - TableDataInfo selectPageLoginInfoList(SysLoginInfoBo loginInfo, PageQuery pageQuery); + PageResult selectPageLoginInfoList(SysLoginInfoBo loginInfo, PageQuery pageQuery); /** * 新增系统登录日志 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysNoticeService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysNoticeService.java index 8482cd0ce..81ec4c592 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysNoticeService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysNoticeService.java @@ -1,7 +1,7 @@ package org.dromara.system.service; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.core.domain.PageResult; import org.dromara.system.domain.bo.SysNoticeBo; import org.dromara.system.domain.vo.SysNoticeVo; @@ -21,7 +21,7 @@ public interface ISysNoticeService { * @param pageQuery 分页参数 * @return 通知公告分页列表 */ - TableDataInfo selectPageNoticeList(SysNoticeBo notice, PageQuery pageQuery); + PageResult selectPageNoticeList(SysNoticeBo notice, PageQuery pageQuery); /** * 查询公告信息 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOperLogService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOperLogService.java index e8b340c73..51c7e95f9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOperLogService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOperLogService.java @@ -1,7 +1,7 @@ package org.dromara.system.service; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.core.domain.PageResult; import org.dromara.system.domain.bo.SysOperLogBo; import org.dromara.system.domain.vo.SysOperLogVo; @@ -21,7 +21,7 @@ public interface ISysOperLogService { * @param pageQuery 分页参数 * @return 操作日志分页列表 */ - TableDataInfo selectPageOperLogList(SysOperLogBo operLog, PageQuery pageQuery); + PageResult selectPageOperLogList(SysOperLogBo operLog, PageQuery pageQuery); /** * 新增操作日志 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssConfigService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssConfigService.java index 2f6dfc9a1..844d699a8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssConfigService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssConfigService.java @@ -1,7 +1,7 @@ package org.dromara.system.service; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.core.domain.PageResult; import org.dromara.system.domain.bo.SysOssConfigBo; import org.dromara.system.domain.vo.SysOssConfigVo; @@ -29,7 +29,7 @@ public interface ISysOssConfigService { /** * 查询列表 */ - TableDataInfo queryPageList(SysOssConfigBo bo, PageQuery pageQuery); + PageResult queryPageList(SysOssConfigBo bo, PageQuery pageQuery); /** * 根据新增业务对象插入对象存储配置 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java index 057c068ce..78eb473df 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java @@ -1,7 +1,7 @@ package org.dromara.system.service; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.core.domain.PageResult; import org.dromara.system.domain.bo.SysOssBo; import org.dromara.system.domain.vo.SysOssVo; import jakarta.servlet.http.HttpServletResponse; @@ -26,7 +26,7 @@ public interface ISysOssService { * @param pageQuery 分页查询实体类 * @return 结果 */ - TableDataInfo queryPageList(SysOssBo sysOss, PageQuery pageQuery); + PageResult queryPageList(SysOssBo sysOss, PageQuery pageQuery); /** * 根据一组 ossIds 获取对应的 SysOssVo 列表 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPostService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPostService.java index 742e2d946..2ada75334 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPostService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPostService.java @@ -1,7 +1,7 @@ package org.dromara.system.service; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.core.domain.PageResult; import org.dromara.system.domain.bo.SysPostBo; import org.dromara.system.domain.vo.SysPostVo; @@ -21,7 +21,7 @@ public interface ISysPostService { * @param pageQuery 分页参数 * @return 岗位分页列表 */ - TableDataInfo selectPagePostList(SysPostBo post, PageQuery pageQuery); + PageResult selectPagePostList(SysPostBo post, PageQuery pageQuery); /** * 查询岗位信息集合 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysRoleService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysRoleService.java index 310d55f09..a34fc1c55 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysRoleService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysRoleService.java @@ -1,7 +1,7 @@ package org.dromara.system.service; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.core.domain.PageResult; import org.dromara.system.domain.SysUserRole; import org.dromara.system.domain.bo.SysRoleBo; import org.dromara.system.domain.vo.SysRoleVo; @@ -23,7 +23,7 @@ public interface ISysRoleService { * @param pageQuery 分页参数 * @return 角色分页列表 */ - TableDataInfo selectPageRoleList(SysRoleBo role, PageQuery pageQuery); + PageResult selectPageRoleList(SysRoleBo role, PageQuery pageQuery); /** * 根据条件查询角色数据 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java index 31ad9bc85..a054e4168 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java @@ -1,7 +1,7 @@ package org.dromara.system.service; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.core.domain.PageResult; import org.dromara.system.domain.bo.SysUserBo; import org.dromara.system.domain.vo.SysUserExportVo; import org.dromara.system.domain.vo.SysUserVo; @@ -23,7 +23,7 @@ public interface ISysUserService { * @param pageQuery 分页参数 * @return 用户分页信息 */ - TableDataInfo selectPageUserList(SysUserBo user, PageQuery pageQuery); + PageResult selectPageUserList(SysUserBo user, PageQuery pageQuery); /** * 导出用户列表 @@ -40,7 +40,7 @@ public interface ISysUserService { * @param pageQuery 分页 * @return 已分配角色的用户分页信息 */ - TableDataInfo selectAllocatedList(SysUserBo user, PageQuery pageQuery); + PageResult selectAllocatedList(SysUserBo user, PageQuery pageQuery); /** * 根据条件分页查询未分配用户角色列表 @@ -49,7 +49,7 @@ public interface ISysUserService { * @param pageQuery 分页 * @return 未分配角色的用户分页信息 */ - TableDataInfo selectUnallocatedList(SysUserBo user, PageQuery pageQuery); + PageResult selectUnallocatedList(SysUserBo user, PageQuery pageQuery); /** * 通过用户名查询用户 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java index f9fd48dff..1724d7a98 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java @@ -13,7 +13,7 @@ import org.dromara.common.core.constant.CacheNames; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.core.domain.PageResult; import org.dromara.system.domain.SysClient; import org.dromara.system.domain.bo.SysClientBo; import org.dromara.system.domain.vo.SysClientVo; @@ -72,11 +72,11 @@ public class SysClientServiceImpl implements ISysClientService { * @return 客户端分页列表 */ @Override - public TableDataInfo queryPageList(SysClientBo bo, PageQuery pageQuery) { + public PageResult queryPageList(SysClientBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); result.getRecords().forEach(r -> r.setGrantTypeList(StringUtils.splitList(r.getGrantType()))); - return TableDataInfo.build(result); + return PageResult.build(result.getRecords(), result.getTotal()); } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java index f0e006bd5..c0339c2b3 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java @@ -17,7 +17,7 @@ import org.dromara.common.core.utils.SpringUtils; import org.dromara.common.core.utils.StringUtils; 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.core.domain.PageResult; import org.dromara.common.redis.utils.CacheUtils; import org.dromara.system.domain.SysConfig; import org.dromara.system.domain.bo.SysConfigBo; @@ -50,10 +50,10 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService { * @return 参数配置分页列表 */ @Override - public TableDataInfo selectPageConfigList(SysConfigBo config, PageQuery pageQuery) { + public PageResult selectPageConfigList(SysConfigBo config, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(config); Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); - return TableDataInfo.build(page); + return PageResult.build(page.getRecords(), page.getTotal()); } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java index 2db1e9543..4b826f3c8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java @@ -17,7 +17,7 @@ import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.service.DeptService; import org.dromara.common.core.utils.*; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.mybatis.helper.DataBaseHelper; import org.dromara.common.redis.utils.CacheUtils; import org.dromara.common.satoken.utils.LoginHelper; @@ -59,9 +59,9 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService { * @return 部门信息集合 */ @Override - public TableDataInfo selectPageDeptList(SysDeptBo dept, PageQuery pageQuery) { + public PageResult selectPageDeptList(SysDeptBo dept, PageQuery pageQuery) { Page page = baseMapper.selectPageDeptList(pageQuery.build(), buildQueryWrapper(dept)); - return TableDataInfo.build(page); + return PageResult.build(page.getRecords(), page.getTotal()); } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java index de03bcd92..c99badc35 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java @@ -10,7 +10,7 @@ import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.redis.utils.CacheUtils; import org.dromara.system.domain.SysDictData; import org.dromara.system.domain.bo.SysDictDataBo; @@ -41,10 +41,10 @@ public class SysDictDataServiceImpl implements ISysDictDataService { * @return 字典数据分页列表 */ @Override - public TableDataInfo selectPageDictDataList(SysDictDataBo dictData, PageQuery pageQuery) { + public PageResult selectPageDictDataList(SysDictDataBo dictData, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(dictData); Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); - return TableDataInfo.build(page); + return PageResult.build(page.getRecords(), page.getTotal()); } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java index 3f349695c..e801aaaea 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java @@ -18,7 +18,7 @@ import org.dromara.common.core.utils.SpringUtils; import org.dromara.common.core.utils.StreamUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.redis.utils.CacheUtils; import org.dromara.system.domain.SysDictData; import org.dromara.system.domain.SysDictType; @@ -56,10 +56,10 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService * @return 字典类型分页列表 */ @Override - public TableDataInfo selectPageDictTypeList(SysDictTypeBo dictType, PageQuery pageQuery) { + public PageResult selectPageDictTypeList(SysDictTypeBo dictType, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(dictType); Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); - return TableDataInfo.build(page); + return PageResult.build(page.getRecords(), page.getTotal()); } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysLoginInfoServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysLoginInfoServiceImpl.java index fc55f04b9..ff3d97502 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysLoginInfoServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysLoginInfoServiceImpl.java @@ -15,7 +15,7 @@ import org.dromara.common.core.utils.StringUtils; import org.dromara.common.core.utils.ip.AddressUtils; import org.dromara.common.log.event.LoginInfoEvent; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.system.domain.SysLoginInfo; import org.dromara.system.domain.bo.SysLoginInfoBo; @@ -121,7 +121,7 @@ public class SysLoginInfoServiceImpl implements ISysLoginInfoService { * @return 登录日志分页列表 */ @Override - public TableDataInfo selectPageLoginInfoList(SysLoginInfoBo loginInfo, PageQuery pageQuery) { + public PageResult selectPageLoginInfoList(SysLoginInfoBo loginInfo, PageQuery pageQuery) { Map params = loginInfo.getParams(); LambdaQueryWrapper lqw = new LambdaQueryWrapper() .like(StringUtils.isNotBlank(loginInfo.getIpaddr()), SysLoginInfo::getIpaddr, loginInfo.getIpaddr()) @@ -133,7 +133,7 @@ public class SysLoginInfoServiceImpl implements ISysLoginInfoService { lqw.orderByDesc(SysLoginInfo::getInfoId); } Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); - return TableDataInfo.build(page); + return PageResult.build(page.getRecords(), page.getTotal()); } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java index 4f0a5c5c4..36d0a367a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java @@ -8,7 +8,7 @@ import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.ObjectUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.core.domain.PageResult; import org.dromara.system.domain.SysNotice; import org.dromara.system.domain.SysUser; import org.dromara.system.domain.bo.SysNoticeBo; @@ -42,10 +42,10 @@ public class SysNoticeServiceImpl implements ISysNoticeService { * @return 通知公告分页列表 */ @Override - public TableDataInfo selectPageNoticeList(SysNoticeBo notice, PageQuery pageQuery) { + public PageResult selectPageNoticeList(SysNoticeBo notice, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(notice); Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); - return TableDataInfo.build(page); + return PageResult.build(page.getRecords(), page.getTotal()); } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java index 86fd42a24..4f9722c01 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java @@ -9,7 +9,7 @@ import org.dromara.common.core.utils.StringUtils; import org.dromara.common.core.utils.ip.AddressUtils; import org.dromara.common.log.event.OperLogEvent; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.core.domain.PageResult; import org.dromara.system.domain.SysOperLog; import org.dromara.system.domain.bo.SysOperLogBo; import org.dromara.system.domain.vo.SysOperLogVo; @@ -57,13 +57,13 @@ public class SysOperLogServiceImpl implements ISysOperLogService { * @return 操作日志分页列表 */ @Override - public TableDataInfo selectPageOperLogList(SysOperLogBo operLog, PageQuery pageQuery) { + public PageResult selectPageOperLogList(SysOperLogBo operLog, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(operLog); if (StringUtils.isBlank(pageQuery.getOrderByColumn())) { lqw.orderByDesc(SysOperLog::getOperId); } Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); - return TableDataInfo.build(page); + return PageResult.build(page.getRecords(), page.getTotal()); } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssConfigServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssConfigServiceImpl.java index dd034b857..996331ea0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssConfigServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssConfigServiceImpl.java @@ -15,7 +15,7 @@ import org.dromara.common.core.utils.ObjectUtils; import org.dromara.common.core.utils.StringUtils; 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.core.domain.PageResult; import org.dromara.common.oss.constant.OssConstant; import org.dromara.common.redis.utils.CacheUtils; import org.dromara.common.redis.utils.RedisUtils; @@ -79,10 +79,10 @@ public class SysOssConfigServiceImpl implements ISysOssConfigService { * @return 配置分页结果 */ @Override - public TableDataInfo queryPageList(SysOssConfigBo bo, PageQuery pageQuery) { + public PageResult queryPageList(SysOssConfigBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); - return TableDataInfo.build(result); + return PageResult.build(result.getRecords(), result.getTotal()); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java index 2bcb45614..949d77a7d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java @@ -19,7 +19,7 @@ import org.dromara.common.core.utils.StringUtils; import org.dromara.common.core.utils.file.FileUtils; 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.core.domain.PageResult; import org.dromara.common.oss.core.OssClient; import org.dromara.common.oss.entity.UploadResult; import org.dromara.common.oss.enums.AccessPolicyType; @@ -63,12 +63,12 @@ public class SysOssServiceImpl implements ISysOssService, OssService { * @return 结果 */ @Override - public TableDataInfo queryPageList(SysOssBo bo, PageQuery pageQuery) { + public PageResult queryPageList(SysOssBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); List filterResult = StreamUtils.toList(result.getRecords(), this::matchingUrl); result.setRecords(filterResult); - return TableDataInfo.build(result); + return PageResult.build(result.getRecords(), result.getTotal()); } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java index 56a0c4bc1..1e1256281 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java @@ -13,7 +13,7 @@ import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StreamUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.core.domain.PageResult; import org.dromara.system.domain.SysPost; import org.dromara.system.domain.SysUserPost; import org.dromara.system.domain.bo.SysPostBo; @@ -49,9 +49,9 @@ public class SysPostServiceImpl implements ISysPostService, PostService { * @return 岗位分页列表 */ @Override - public TableDataInfo selectPagePostList(SysPostBo post, PageQuery pageQuery) { + public PageResult selectPagePostList(SysPostBo post, PageQuery pageQuery) { Page page = baseMapper.selectPagePostList(pageQuery.build(), buildQueryWrapper(post)); - return TableDataInfo.build(page); + return PageResult.build(page.getRecords(), page.getTotal()); } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java index 01b1a3284..c9668e30b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java @@ -20,7 +20,7 @@ import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StreamUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.system.domain.SysRole; import org.dromara.system.domain.SysRoleDept; @@ -61,9 +61,9 @@ public class SysRoleServiceImpl implements ISysRoleService, RoleService { * @return 角色分页列表 */ @Override - public TableDataInfo selectPageRoleList(SysRoleBo role, PageQuery pageQuery) { + public PageResult selectPageRoleList(SysRoleBo role, PageQuery pageQuery) { Page page = baseMapper.selectPageRoleList(pageQuery.build(), this.buildQueryWrapper(role)); - return TableDataInfo.build(page); + return PageResult.build(page.getRecords(), page.getTotal()); } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTaskAssigneeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTaskAssigneeServiceImpl.java index 7b31f7b1f..dbd743c86 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTaskAssigneeServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTaskAssigneeServiceImpl.java @@ -7,7 +7,7 @@ import org.dromara.common.core.domain.dto.TaskAssigneeDTO; import org.dromara.common.core.domain.model.TaskAssigneeBody; import org.dromara.common.core.service.TaskAssigneeService; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.core.domain.PageResult; import org.dromara.system.domain.bo.SysDeptBo; import org.dromara.system.domain.bo.SysPostBo; import org.dromara.system.domain.bo.SysRoleBo; @@ -56,7 +56,7 @@ public class SysTaskAssigneeServiceImpl implements TaskAssigneeService { Map params = bo.getParams(); params.put("beginTime", taskQuery.getBeginTime()); params.put("endTime", taskQuery.getEndTime()); - TableDataInfo page = roleService.selectPageRoleList(bo, pageQuery); + PageResult page = roleService.selectPageRoleList(bo, pageQuery); // 使用封装的字段映射方法进行转换 List handlers = TaskAssigneeDTO.convertToHandlerList(page.getRows(), item -> Convert.toStr(item.getRoleId()), SysRoleVo::getRoleKey, SysRoleVo::getRoleName, item -> "", SysRoleVo::getCreateTime); @@ -80,7 +80,7 @@ public class SysTaskAssigneeServiceImpl implements TaskAssigneeService { params.put("beginTime", taskQuery.getBeginTime()); params.put("endTime", taskQuery.getEndTime()); bo.setBelongDeptId(Convert.toLong(taskQuery.getGroupId())); - TableDataInfo page = postService.selectPagePostList(bo, pageQuery); + PageResult page = postService.selectPagePostList(bo, pageQuery); // 使用封装的字段映射方法进行转换 List handlers = TaskAssigneeDTO.convertToHandlerList(page.getRows(), item -> Convert.toStr(item.getPostId()), SysPostVo::getPostCategory, SysPostVo::getPostName, item -> Convert.toStr(item.getDeptId()), SysPostVo::getCreateTime); @@ -104,7 +104,7 @@ public class SysTaskAssigneeServiceImpl implements TaskAssigneeService { params.put("beginTime", taskQuery.getBeginTime()); params.put("endTime", taskQuery.getEndTime()); bo.setBelongDeptId(Convert.toLong(taskQuery.getGroupId())); - TableDataInfo page = deptService.selectPageDeptList(bo, pageQuery); + PageResult page = deptService.selectPageDeptList(bo, pageQuery); // 使用封装的字段映射方法进行转换 List handlers = TaskAssigneeDTO.convertToHandlerList(page.getRows(), item -> Convert.toStr(item.getDeptId()), SysDeptVo::getDeptCategory, SysDeptVo::getDeptName, item -> Convert.toStr(item.getParentId()), SysDeptVo::getCreateTime); @@ -128,7 +128,7 @@ public class SysTaskAssigneeServiceImpl implements TaskAssigneeService { params.put("beginTime", taskQuery.getBeginTime()); params.put("endTime", taskQuery.getEndTime()); bo.setDeptId(Convert.toLong(taskQuery.getGroupId())); - TableDataInfo page = userService.selectPageUserList(bo, pageQuery); + PageResult page = userService.selectPageUserList(bo, pageQuery); // 使用封装的字段映射方法进行转换 List handlers = TaskAssigneeDTO.convertToHandlerList(page.getRows(), item -> Convert.toStr(item.getUserId()), SysUserVo::getUserName, SysUserVo::getNickName, item -> Convert.toStr(item.getDeptId()), SysUserVo::getCreateTime); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java index 5eeeb3781..9370d49c1 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java @@ -7,7 +7,6 @@ import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; 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.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -20,7 +19,7 @@ import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.service.UserService; import org.dromara.common.core.utils.*; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.system.domain.SysUser; import org.dromara.system.domain.SysUserPost; @@ -64,9 +63,9 @@ public class SysUserServiceImpl implements ISysUserService, UserService { * @return 用户分页结果 */ @Override - public TableDataInfo selectPageUserList(SysUserBo user, PageQuery pageQuery) { + public PageResult selectPageUserList(SysUserBo user, PageQuery pageQuery) { Page page = baseMapper.selectPageUserList(pageQuery.build(), this.buildQueryWrapper(user)); - return TableDataInfo.build(page); + return PageResult.build(page.getRecords(), page.getTotal()); } /** @@ -116,9 +115,9 @@ public class SysUserServiceImpl implements ISysUserService, UserService { * @return 用户信息集合信息 */ @Override - public TableDataInfo selectAllocatedList(SysUserBo user, PageQuery pageQuery) { + public PageResult selectAllocatedList(SysUserBo user, PageQuery pageQuery) { Page page = baseMapper.selectAllocatedList(pageQuery.build(), user); - return TableDataInfo.build(page); + return PageResult.build(page.getRecords(), page.getTotal()); } /** @@ -128,10 +127,10 @@ public class SysUserServiceImpl implements ISysUserService, UserService { * @return 用户信息集合信息 */ @Override - public TableDataInfo selectUnallocatedList(SysUserBo user, PageQuery pageQuery) { + public PageResult selectUnallocatedList(SysUserBo user, PageQuery pageQuery) { List userIds = userRoleMapper.selectUserIdsByRoleId(user.getRoleId()); Page page = baseMapper.selectUnallocatedList(pageQuery.build(), user, userIds); - return TableDataInfo.build(page); + return PageResult.build(page.getRecords(), page.getTotal()); } /** diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java index aaf4fb56f..02bd05305 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java @@ -7,7 +7,7 @@ import org.dromara.common.redis.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.core.domain.PageResult; import org.dromara.common.web.core.BaseController; import org.dromara.warm.flow.core.entity.Definition; import org.dromara.warm.flow.core.service.DefService; @@ -46,8 +46,8 @@ public class FlwDefinitionController extends BaseController { * @return 流程定义分页数据 */ @GetMapping("/list") - public TableDataInfo list(FlowDefinition flowDefinition, PageQuery pageQuery) { - return flwDefinitionService.queryList(flowDefinition, pageQuery); + public R> list(FlowDefinition flowDefinition, PageQuery pageQuery) { + return R.ok(flwDefinitionService.queryList(flowDefinition, pageQuery)); } /** @@ -58,8 +58,8 @@ public class FlwDefinitionController extends BaseController { * @return 未发布流程定义分页数据 */ @GetMapping("/unPublishList") - public TableDataInfo unPublishList(FlowDefinition flowDefinition, PageQuery pageQuery) { - return flwDefinitionService.unPublishList(flowDefinition, pageQuery); + public R> unPublishList(FlowDefinition flowDefinition, PageQuery pageQuery) { + return R.ok(flwDefinitionService.unPublishList(flowDefinition, pageQuery)); } /** diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java index 66137eb7c..36369296b 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java @@ -8,7 +8,7 @@ import org.dromara.common.redis.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.core.domain.PageResult; import org.dromara.common.web.core.BaseController; import org.dromara.warm.flow.core.service.InsService; import org.dromara.workflow.common.ConditionalOnEnable; @@ -47,8 +47,8 @@ public class FlwInstanceController extends BaseController { * @return 正在运行的流程实例分页数据 */ @GetMapping("/pageByRunning") - public TableDataInfo selectRunningInstanceList(FlowInstanceBo flowInstanceBo, PageQuery pageQuery) { - return flwInstanceService.selectRunningInstanceList(flowInstanceBo, pageQuery); + public R> selectRunningInstanceList(FlowInstanceBo flowInstanceBo, PageQuery pageQuery) { + return R.ok(flwInstanceService.selectRunningInstanceList(flowInstanceBo, pageQuery)); } /** @@ -59,8 +59,8 @@ public class FlwInstanceController extends BaseController { * @return 已结束的流程实例分页数据 */ @GetMapping("/pageByFinish") - public TableDataInfo selectFinishInstanceList(FlowInstanceBo flowInstanceBo, PageQuery pageQuery) { - return flwInstanceService.selectFinishInstanceList(flowInstanceBo, pageQuery); + public R> selectFinishInstanceList(FlowInstanceBo flowInstanceBo, PageQuery pageQuery) { + return R.ok(flwInstanceService.selectFinishInstanceList(flowInstanceBo, pageQuery)); } /** @@ -145,8 +145,8 @@ public class FlwInstanceController extends BaseController { * @return 当前用户发起的流程实例分页数据 */ @GetMapping("/pageByCurrent") - public TableDataInfo selectCurrentInstanceList(FlowInstanceBo flowInstanceBo, PageQuery pageQuery) { - return flwInstanceService.selectCurrentInstanceList(flowInstanceBo, pageQuery); + public R> selectCurrentInstanceList(FlowInstanceBo flowInstanceBo, PageQuery pageQuery) { + return R.ok(flwInstanceService.selectCurrentInstanceList(flowInstanceBo, pageQuery)); } /** diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwSpelController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwSpelController.java index 3f8aad044..3c1aaeb5c 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwSpelController.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwSpelController.java @@ -11,7 +11,7 @@ import org.dromara.common.redis.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.core.domain.PageResult; import org.dromara.common.web.core.BaseController; import org.dromara.workflow.common.ConditionalOnEnable; import org.dromara.workflow.domain.bo.FlowSpelBo; @@ -46,8 +46,8 @@ public class FlwSpelController extends BaseController { */ @SaCheckPermission("workflow:spel:list") @GetMapping("/list") - public TableDataInfo list(FlowSpelBo bo, PageQuery pageQuery) { - return flwSpelService.queryPageList(bo, pageQuery); + public R> list(FlowSpelBo bo, PageQuery pageQuery) { + return R.ok(flwSpelService.queryPageList(bo, pageQuery)); } /** diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java index f9f3a182c..aed9fb985 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java @@ -9,7 +9,7 @@ import org.dromara.common.redis.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.core.domain.PageResult; import org.dromara.common.web.core.BaseController; import org.dromara.warm.flow.core.entity.Node; import org.dromara.warm.flow.orm.entity.FlowNode; @@ -72,8 +72,8 @@ public class FlwTaskController extends BaseController { * @return 待办任务分页数据 */ @GetMapping("/pageByTaskWait") - public TableDataInfo pageByTaskWait(FlowTaskBo flowTaskBo, PageQuery pageQuery) { - return flwTaskService.pageByTaskWait(flowTaskBo, pageQuery); + public R> pageByTaskWait(FlowTaskBo flowTaskBo, PageQuery pageQuery) { + return R.ok(flwTaskService.pageByTaskWait(flowTaskBo, pageQuery)); } /** @@ -84,8 +84,8 @@ public class FlwTaskController extends BaseController { * @return 已办任务分页数据 */ @GetMapping("/pageByTaskFinish") - public TableDataInfo pageByTaskFinish(FlowTaskBo flowTaskBo, PageQuery pageQuery) { - return flwTaskService.pageByTaskFinish(flowTaskBo, pageQuery); + public R> pageByTaskFinish(FlowTaskBo flowTaskBo, PageQuery pageQuery) { + return R.ok(flwTaskService.pageByTaskFinish(flowTaskBo, pageQuery)); } /** @@ -97,8 +97,8 @@ public class FlwTaskController extends BaseController { * @return 待办任务分页数据 */ @GetMapping("/pageByAllTaskWait") - public TableDataInfo pageByAllTaskWait(FlowTaskBo flowTaskBo, PageQuery pageQuery) { - return flwTaskService.pageByAllTaskWait(flowTaskBo, pageQuery); + public R> pageByAllTaskWait(FlowTaskBo flowTaskBo, PageQuery pageQuery) { + return R.ok(flwTaskService.pageByAllTaskWait(flowTaskBo, pageQuery)); } /** @@ -109,8 +109,8 @@ public class FlwTaskController extends BaseController { * @return 已办任务分页数据 */ @GetMapping("/pageByAllTaskFinish") - public TableDataInfo pageByAllTaskFinish(FlowTaskBo flowTaskBo, PageQuery pageQuery) { - return flwTaskService.pageByAllTaskFinish(flowTaskBo, pageQuery); + public R> pageByAllTaskFinish(FlowTaskBo flowTaskBo, PageQuery pageQuery) { + return R.ok(flwTaskService.pageByAllTaskFinish(flowTaskBo, pageQuery)); } /** @@ -121,8 +121,8 @@ public class FlwTaskController extends BaseController { * @return 抄送任务分页数据 */ @GetMapping("/pageByTaskCopy") - public TableDataInfo pageByTaskCopy(FlowTaskBo flowTaskBo, PageQuery pageQuery) { - return flwTaskService.pageByTaskCopy(flowTaskBo, pageQuery); + public R> pageByTaskCopy(FlowTaskBo flowTaskBo, PageQuery pageQuery) { + return R.ok(flwTaskService.pageByTaskCopy(flowTaskBo, pageQuery)); } /** diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java index 10e6c21c6..ce46e9272 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java @@ -13,7 +13,7 @@ import org.dromara.common.redis.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.core.domain.PageResult; import org.dromara.common.web.core.BaseController; import org.dromara.workflow.common.ConditionalOnEnable; import org.dromara.workflow.domain.bo.TestLeaveBo; @@ -48,8 +48,8 @@ public class TestLeaveController extends BaseController { */ @SaCheckPermission("workflow:leave:list") @GetMapping("/list") - public TableDataInfo list(TestLeaveBo bo, PageQuery pageQuery) { - return testLeaveService.queryPageList(bo, pageQuery); + public R> list(TestLeaveBo bo, PageQuery pageQuery) { + return R.ok(testLeaveService.queryPageList(bo, pageQuery)); } /** diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwDefinitionService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwDefinitionService.java index 7641761a1..695228136 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwDefinitionService.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwDefinitionService.java @@ -2,7 +2,7 @@ package org.dromara.workflow.service; import jakarta.servlet.http.HttpServletResponse; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.core.domain.PageResult; import org.dromara.warm.flow.orm.entity.FlowDefinition; import org.dromara.workflow.domain.vo.FlowDefinitionVo; import org.springframework.web.multipart.MultipartFile; @@ -24,7 +24,7 @@ public interface IFlwDefinitionService { * @param pageQuery 分页 * @return 返回分页列表 */ - TableDataInfo queryList(FlowDefinition flowDefinition, PageQuery pageQuery); + PageResult queryList(FlowDefinition flowDefinition, PageQuery pageQuery); /** * 查询未发布的流程定义列表 @@ -33,7 +33,7 @@ public interface IFlwDefinitionService { * @param pageQuery 分页 * @return 返回分页列表 */ - TableDataInfo unPublishList(FlowDefinition flowDefinition, PageQuery pageQuery); + PageResult unPublishList(FlowDefinition flowDefinition, PageQuery pageQuery); /** * 发布流程定义 diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwInstanceService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwInstanceService.java index 462af319d..6e20abe3d 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwInstanceService.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwInstanceService.java @@ -1,7 +1,7 @@ package org.dromara.workflow.service; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.core.domain.PageResult; import org.dromara.warm.flow.orm.entity.FlowInstance; import org.dromara.workflow.domain.bo.FlowCancelBo; import org.dromara.workflow.domain.bo.FlowInstanceBo; @@ -26,7 +26,7 @@ public interface IFlwInstanceService { * @param pageQuery 分页 * @return 结果 */ - TableDataInfo selectRunningInstanceList(FlowInstanceBo flowInstanceBo, PageQuery pageQuery); + PageResult selectRunningInstanceList(FlowInstanceBo flowInstanceBo, PageQuery pageQuery); /** * 分页查询已结束的流程实例 @@ -35,7 +35,7 @@ public interface IFlwInstanceService { * @param pageQuery 分页 * @return 结果 */ - TableDataInfo selectFinishInstanceList(FlowInstanceBo flowInstanceBo, PageQuery pageQuery); + PageResult selectFinishInstanceList(FlowInstanceBo flowInstanceBo, PageQuery pageQuery); /** * 根据业务 id 查询流程实例详情，返回业务侧展示所需信息。 @@ -108,7 +108,7 @@ public interface IFlwInstanceService { * @param pageQuery 分页 * @return 结果 */ - TableDataInfo selectCurrentInstanceList(FlowInstanceBo instanceBo, PageQuery pageQuery); + PageResult selectCurrentInstanceList(FlowInstanceBo instanceBo, PageQuery pageQuery); /** * 获取流程图及历史办理记录，供前端展示流转轨迹。 diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwSpelService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwSpelService.java index e9605c936..53bfec40e 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwSpelService.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwSpelService.java @@ -3,7 +3,7 @@ package org.dromara.workflow.service; import org.dromara.common.core.domain.dto.TaskAssigneeDTO; import org.dromara.common.core.domain.model.TaskAssigneeBody; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.core.domain.PageResult; import org.dromara.workflow.domain.bo.FlowSpelBo; import org.dromara.workflow.domain.vo.FlowSpelVo; @@ -34,7 +34,7 @@ public interface IFlwSpelService { * @param pageQuery 分页参数 * @return 流程spel表达式定义分页列表 */ - TableDataInfo queryPageList(FlowSpelBo bo, PageQuery pageQuery); + PageResult queryPageList(FlowSpelBo bo, PageQuery pageQuery); /** * 查询符合条件的流程 SpEL 表达式定义列表。 diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskService.java index 2646f3291..55758874d 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskService.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskService.java @@ -3,7 +3,7 @@ package org.dromara.workflow.service; import org.dromara.common.core.domain.dto.StartProcessReturnDTO; import org.dromara.common.core.domain.dto.UserDTO; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.core.domain.PageResult; import org.dromara.warm.flow.core.entity.Node; import org.dromara.warm.flow.core.entity.Task; import org.dromara.warm.flow.orm.entity.FlowHisTask; @@ -53,7 +53,7 @@ public interface IFlwTaskService { * @param pageQuery 分页 * @return 当前用户待办任务分页结果 */ - TableDataInfo pageByTaskWait(FlowTaskBo flowTaskBo, PageQuery pageQuery); + PageResult pageByTaskWait(FlowTaskBo flowTaskBo, PageQuery pageQuery); /** * 查询当前租户所有待办任务 @@ -62,7 +62,7 @@ public interface IFlwTaskService { * @param pageQuery 分页 * @return 当前用户已办任务分页结果 */ - TableDataInfo pageByTaskFinish(FlowTaskBo flowTaskBo, PageQuery pageQuery); + PageResult pageByTaskFinish(FlowTaskBo flowTaskBo, PageQuery pageQuery); /** * 查询待办任务 @@ -71,7 +71,7 @@ public interface IFlwTaskService { * @param pageQuery 分页 * @return 当前租户待办任务分页结果 */ - TableDataInfo pageByAllTaskWait(FlowTaskBo flowTaskBo, PageQuery pageQuery); + PageResult pageByAllTaskWait(FlowTaskBo flowTaskBo, PageQuery pageQuery); /** * 查询已办任务 @@ -80,7 +80,7 @@ public interface IFlwTaskService { * @param pageQuery 分页 * @return 当前租户已办任务分页结果 */ - TableDataInfo pageByAllTaskFinish(FlowTaskBo flowTaskBo, PageQuery pageQuery); + PageResult pageByAllTaskFinish(FlowTaskBo flowTaskBo, PageQuery pageQuery); /** * 查询当前用户的抄送 @@ -89,7 +89,7 @@ public interface IFlwTaskService { * @param pageQuery 分页 * @return 当前用户抄送分页结果 */ - TableDataInfo pageByTaskCopy(FlowTaskBo flowTaskBo, PageQuery pageQuery); + PageResult pageByTaskCopy(FlowTaskBo flowTaskBo, PageQuery pageQuery); /** * 修改任务办理人 diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/ITestLeaveService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/ITestLeaveService.java index a2f4ad831..7ed779a6b 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/ITestLeaveService.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/ITestLeaveService.java @@ -1,7 +1,7 @@ package org.dromara.workflow.service; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.core.domain.PageResult; import org.dromara.workflow.domain.bo.TestLeaveBo; import org.dromara.workflow.domain.vo.TestLeaveVo; @@ -30,7 +30,7 @@ public interface ITestLeaveService { * @param pageQuery 分页参数 * @return 请假分页数据 */ - TableDataInfo queryPageList(TestLeaveBo bo, PageQuery pageQuery); + PageResult queryPageList(TestLeaveBo bo, PageQuery pageQuery); /** * 查询符合条件的请假列表。 diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java index 8984a752a..02fc79ede 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java @@ -15,7 +15,7 @@ import org.dromara.common.core.utils.StreamUtils; import org.dromara.common.core.utils.StringUtils; 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.core.domain.PageResult; import org.dromara.warm.flow.core.dto.DefJson; import org.dromara.warm.flow.core.enums.NodeType; import org.dromara.warm.flow.core.enums.PublishStatus; @@ -69,12 +69,12 @@ public class FlwDefinitionServiceImpl implements IFlwDefinitionService { * @return 返回分页列表 */ @Override - public TableDataInfo queryList(FlowDefinition flowDefinition, PageQuery pageQuery) { + public PageResult queryList(FlowDefinition flowDefinition, PageQuery pageQuery) { LambdaQueryWrapper wrapper = buildQueryWrapper(flowDefinition); wrapper.eq(FlowDefinition::getIsPublish, PublishStatus.PUBLISHED.getKey()); Page page = flowDefinitionMapper.selectPage(pageQuery.build(), wrapper); List list = BeanUtil.copyToList(page.getRecords(), FlowDefinitionVo.class); - return new TableDataInfo<>(list, page.getTotal()); + return new PageResult<>(list, page.getTotal()); } /** @@ -85,12 +85,12 @@ public class FlwDefinitionServiceImpl implements IFlwDefinitionService { * @return 返回分页列表 */ @Override - public TableDataInfo unPublishList(FlowDefinition flowDefinition, PageQuery pageQuery) { + public PageResult unPublishList(FlowDefinition flowDefinition, PageQuery pageQuery) { LambdaQueryWrapper wrapper = buildQueryWrapper(flowDefinition); wrapper.in(FlowDefinition::getIsPublish, Arrays.asList(PublishStatus.UNPUBLISHED.getKey(), PublishStatus.EXPIRED.getKey())); Page page = flowDefinitionMapper.selectPage(pageQuery.build(), wrapper); List list = BeanUtil.copyToList(page.getRecords(), FlowDefinitionVo.class); - return new TableDataInfo<>(list, page.getTotal()); + return new PageResult<>(list, page.getTotal()); } /** diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java index 57cdf4b75..f9610dddb 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java @@ -16,7 +16,7 @@ import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.StreamUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.warm.flow.core.FlowEngine; import org.dromara.warm.flow.core.constant.ExceptionCons; @@ -83,11 +83,11 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService { * @return 当前符合条件的运行中流程实例分页结果 */ @Override - public TableDataInfo selectRunningInstanceList(FlowInstanceBo flowInstanceBo, PageQuery pageQuery) { + public PageResult selectRunningInstanceList(FlowInstanceBo flowInstanceBo, PageQuery pageQuery) { MPJLambdaWrapper queryWrapper = buildQueryWrapper(flowInstanceBo); queryWrapper.in("fi", FlowInstance::getFlowStatus, BusinessStatusEnum.runningStatus()); Page page = flwInstanceMapper.selectInstanceList(pageQuery.build(), queryWrapper); - return TableDataInfo.build(page); + return PageResult.build(page.getRecords(), page.getTotal()); } /** @@ -98,11 +98,11 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService { * @return 当前符合条件的已结束流程实例分页结果 */ @Override - public TableDataInfo selectFinishInstanceList(FlowInstanceBo flowInstanceBo, PageQuery pageQuery) { + public PageResult selectFinishInstanceList(FlowInstanceBo flowInstanceBo, PageQuery pageQuery) { MPJLambdaWrapper queryWrapper = buildQueryWrapper(flowInstanceBo); queryWrapper.in("fi", FlowInstance::getFlowStatus, BusinessStatusEnum.finishStatus()); Page page = flwInstanceMapper.selectInstanceList(pageQuery.build(), queryWrapper); - return TableDataInfo.build(page); + return PageResult.build(page.getRecords(), page.getTotal()); } /** @@ -340,11 +340,11 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService { * @return 当前登录人发起的流程实例分页结果 */ @Override - public TableDataInfo selectCurrentInstanceList(FlowInstanceBo instanceBo, PageQuery pageQuery) { + public PageResult selectCurrentInstanceList(FlowInstanceBo instanceBo, PageQuery pageQuery) { MPJLambdaWrapper queryWrapper = buildQueryWrapper(instanceBo); queryWrapper.eq("fi", FlowInstance::getCreateBy, LoginHelper.getUserIdStr()); Page page = flwInstanceMapper.selectInstanceList(pageQuery.build(), queryWrapper); - return TableDataInfo.build(page); + return PageResult.build(page.getRecords(), page.getTotal()); } /** diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwSpelServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwSpelServiceImpl.java index 2cfec7891..a5e506522 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwSpelServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwSpelServiceImpl.java @@ -15,7 +15,7 @@ import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StreamUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.core.domain.PageResult; import org.dromara.workflow.common.ConditionalOnEnable; import org.dromara.workflow.domain.FlowSpel; import org.dromara.workflow.domain.bo.FlowSpelBo; @@ -62,10 +62,10 @@ public class FlwSpelServiceImpl implements IFlwSpelService { * @return 流程spel表达式定义分页列表 */ @Override - public TableDataInfo queryPageList(FlowSpelBo bo, PageQuery pageQuery) { + public PageResult queryPageList(FlowSpelBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); - return TableDataInfo.build(result); + return PageResult.build(result.getRecords(), result.getTotal()); } /** @@ -176,7 +176,7 @@ public class FlwSpelServiceImpl implements IFlwSpelService { Map params = bo.getParams(); params.put("beginTime", taskQuery.getBeginTime()); params.put("endTime", taskQuery.getEndTime()); - TableDataInfo page = this.queryPageList(bo, pageQuery); + PageResult page = this.queryPageList(bo, pageQuery); // 使用封装的字段映射方法进行转换 List handlers = TaskAssigneeDTO.convertToHandlerList(page.getRows(), FlowSpelVo::getViewSpel, item -> "", FlowSpelVo::getRemark, item -> "", FlowSpelVo::getCreateTime); diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java index 9ef790e5f..3e248f02c 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java @@ -23,7 +23,7 @@ import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; 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.core.domain.PageResult; import org.dromara.common.mybatis.utils.IdGeneratorUtil; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.warm.flow.core.FlowEngine; @@ -378,10 +378,10 @@ public class FlwTaskServiceImpl implements IFlwTaskService { * @return 当前登录人的待办任务分页结果 */ @Override - public TableDataInfo pageByTaskWait(FlowTaskBo flowTaskBo, PageQuery pageQuery) { + public PageResult pageByTaskWait(FlowTaskBo flowTaskBo, PageQuery pageQuery) { Page page = flwTaskMapper.getListRunTask(pageQuery.build(), flowTaskBo, categoryIds(flowTaskBo), LoginHelper.getUserIdStr()); this.wrapAssigneeInfo(page.getRecords()); - return TableDataInfo.build(page); + return PageResult.build(page.getRecords(), page.getTotal()); } /** @@ -392,9 +392,9 @@ public class FlwTaskServiceImpl implements IFlwTaskService { * @return 当前登录人的已办任务分页结果 */ @Override - public TableDataInfo pageByTaskFinish(FlowTaskBo flowTaskBo, PageQuery pageQuery) { + public PageResult pageByTaskFinish(FlowTaskBo flowTaskBo, PageQuery pageQuery) { Page page = flwHisTaskMapper.getListFinishTask(pageQuery.build(), flowTaskBo, categoryIds(flowTaskBo), LoginHelper.getUserIdStr()); - return TableDataInfo.build(page); + return PageResult.build(page.getRecords(), page.getTotal()); } /** @@ -405,10 +405,10 @@ public class FlwTaskServiceImpl implements IFlwTaskService { * @return 全部待办任务分页结果 */ @Override - public TableDataInfo pageByAllTaskWait(FlowTaskBo flowTaskBo, PageQuery pageQuery) { + public PageResult pageByAllTaskWait(FlowTaskBo flowTaskBo, PageQuery pageQuery) { Page page = flwTaskMapper.getListRunTask(pageQuery.build(), flowTaskBo, categoryIds(flowTaskBo), null); this.wrapAssigneeInfo(page.getRecords()); - return TableDataInfo.build(page); + return PageResult.build(page.getRecords(), page.getTotal()); } /** @@ -437,9 +437,9 @@ public class FlwTaskServiceImpl implements IFlwTaskService { * @return 全部已办任务分页结果 */ @Override - public TableDataInfo pageByAllTaskFinish(FlowTaskBo flowTaskBo, PageQuery pageQuery) { + public PageResult pageByAllTaskFinish(FlowTaskBo flowTaskBo, PageQuery pageQuery) { Page page = flwHisTaskMapper.getListFinishTask(pageQuery.build(), flowTaskBo, categoryIds(flowTaskBo), null); - return TableDataInfo.build(page); + return PageResult.build(page.getRecords(), page.getTotal()); } /** @@ -450,9 +450,9 @@ public class FlwTaskServiceImpl implements IFlwTaskService { * @return 当前登录人收到的抄送分页结果 */ @Override - public TableDataInfo pageByTaskCopy(FlowTaskBo flowTaskBo, PageQuery pageQuery) { + public PageResult pageByTaskCopy(FlowTaskBo flowTaskBo, PageQuery pageQuery) { Page page = flwTaskMapper.getTaskCopyByPage(pageQuery.build(), flowTaskBo, categoryIds(flowTaskBo), LoginHelper.getUserIdStr()); - return TableDataInfo.build(page); + return PageResult.build(page.getRecords(), page.getTotal()); } /** diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java index 54f5d4788..ddb69007b 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java @@ -22,7 +22,7 @@ import org.dromara.common.core.utils.StreamUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.core.domain.PageResult; import org.dromara.workflow.common.ConditionalOnEnable; import org.dromara.workflow.common.constant.FlowConstant; import org.dromara.workflow.domain.TestLeave; @@ -84,10 +84,10 @@ public class TestLeaveServiceImpl implements ITestLeaveService { * @return 请假分页列表 */ @Override - public TableDataInfo queryPageList(TestLeaveBo bo, PageQuery pageQuery) { + public PageResult queryPageList(TestLeaveBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); - return TableDataInfo.build(result); + return PageResult.build(result.getRecords(), result.getTotal()); } /**