From 81b50b9b3c3e6ec071ee46431e003470fcac6852 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 13 五月 2021 23:52:36 +0800
Subject: [PATCH] update 代码生成器修改为MP分页(未完成)
---
ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm | 27 ++-------------------------
1 files changed, 2 insertions(+), 25 deletions(-)
diff --git a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm b/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
index fb1aa9c..b6485c7 100644
--- a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
@@ -2,11 +2,11 @@
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}.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 @@
#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
--
Gitblit v1.9.3