update 代码生成器修改为MP分页(未完成)
This commit is contained in:
parent
7c26e516c9
commit
81b50b9b3c
|
@ -53,9 +53,7 @@ public class ${ClassName}Controller extends BaseController {
|
|||
@GetMapping("/list")
|
||||
#if($table.crud || $table.sub)
|
||||
public TableDataInfo<${ClassName}Vo> list(${ClassName}QueryBo bo) {
|
||||
startPage();
|
||||
List<${ClassName}Vo> list = i${ClassName}Service.queryList(bo);
|
||||
return getDataTable(list);
|
||||
return i${ClassName}Service.queryPageList(bo);
|
||||
}
|
||||
#elseif($table.tree)
|
||||
public AjaxResult<${ClassName}Vo> list(${ClassName}QueryBo bo) {
|
||||
|
|
|
@ -5,7 +5,10 @@ import ${packageName}.vo.${ClassName}Vo;
|
|||
import ${packageName}.bo.${ClassName}QueryBo;
|
||||
import ${packageName}.bo.${ClassName}AddBo;
|
||||
import ${packageName}.bo.${ClassName}EditBo;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.ruoyi.common.core.page.IServicePlus;
|
||||
#if($table.crud || $table.sub)
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
#end
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
@ -16,13 +19,19 @@ import java.util.List;
|
|||
* @author ${author}
|
||||
* @date ${datetime}
|
||||
*/
|
||||
public interface I${ClassName}Service extends IService<${ClassName}> {
|
||||
public interface I${ClassName}Service extends IServicePlus<${ClassName}> {
|
||||
/**
|
||||
* 查询单个
|
||||
* @return
|
||||
*/
|
||||
${ClassName}Vo queryById(${pkColumn.javaType} ${pkColumn.javaField});
|
||||
|
||||
#if($table.crud || $table.sub)
|
||||
/**
|
||||
* 查询列表
|
||||
*/
|
||||
TableDataInfo<${ClassName}Vo> queryPageList(${ClassName}QueryBo bo);
|
||||
#end
|
||||
/**
|
||||
* 查询列表
|
||||
*/
|
||||
|
|
|
@ -2,11 +2,11 @@ package ${packageName}.service.impl;
|
|||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.ruoyi.common.utils.PageUtils;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.github.pagehelper.Page;
|
||||
import ${packageName}.bo.${ClassName}AddBo;
|
||||
import ${packageName}.bo.${ClassName}QueryBo;
|
||||
import ${packageName}.bo.${ClassName}EditBo;
|
||||
|
@ -15,11 +15,8 @@ import ${packageName}.mapper.${ClassName}Mapper;
|
|||
import ${packageName}.vo.${ClassName}Vo;
|
||||
import ${packageName}.service.I${ClassName}Service;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* ${functionName}Service业务层处理
|
||||
|
@ -61,27 +58,7 @@ public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${C
|
|||
#end
|
||||
#end
|
||||
#end
|
||||
return entity2Vo(this.list(lqw));
|
||||
}
|
||||
|
||||
/**
|
||||
* 实体类转化成视图对象
|
||||
*
|
||||
* @param collection 实体类集合
|
||||
* @return
|
||||
*/
|
||||
private List<${ClassName}Vo> entity2Vo(Collection<${ClassName}> collection) {
|
||||
List<${ClassName}Vo> voList = collection.stream()
|
||||
.map(any -> BeanUtil.toBean(any, ${ClassName}Vo.class))
|
||||
.collect(Collectors.toList());
|
||||
if (collection instanceof Page) {
|
||||
Page<${ClassName}> page = (Page<${ClassName}>)collection;
|
||||
Page<${ClassName}Vo> pageVo = new Page<>();
|
||||
BeanUtil.copyProperties(page,pageVo);
|
||||
pageVo.addAll(voList);
|
||||
voList = pageVo;
|
||||
}
|
||||
return voList;
|
||||
return PageUtils.buildDataInfo(page(PageUtils.buildPagePlus(), lqw));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
Loading…
Reference in New Issue