xiaozhi/xiaozhi-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!837 [mod]分页查询接口使用R类型返回：数据放入data中

Browse Source 
* [mod]将PageResult从common-mybatis挪到common-core中
* [mod]TableDataInfo修改为PageResult
* [mod]分页查询接口使用R类型返回：数据放入data中
This commit is contained in:
YueYe
2026-03-17 11:15:55 +00:00
committed by 疯狂的狮子Li
parent 01da77ba17
commit 13aae27579
68 changed files with 314 additions and 345 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
+3 -3
View File
@@ -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<PageResult<${ClassName}Vo>> list(${ClassName}Bo bo, PageQuery pageQuery) {
return R.ok(${className}Service.queryPageList(bo, pageQuery));
}
#elseif($table.tree)
public R<List<${ClassName}Vo>> list(${ClassName}Bo bo) {
ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/service.java.vm
+2 -2
View File
@@ -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
/**
ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
+3 -3
View File
@@ -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