From a51f7d52ed93f62f5f5eeb445163ab48a523dbe2 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 11 六月 2021 09:23:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm | 53 +++++++++++++++++++++++------------------------------
1 files changed, 23 insertions(+), 30 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..c727ce6 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,15 @@
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil;
+#if($table.crud || $table.sub)
+import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.core.page.PagePlus;
+import com.ruoyi.common.core.page.TableDataInfo;
+#end
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 +19,9 @@
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;
+import java.util.Collection;
/**
* ${functionName}Service涓氬姟灞傚鐞�
@@ -32,12 +34,23 @@
@Override
public ${ClassName}Vo queryById(${pkColumn.javaType} ${pkColumn.javaField}){
- ${ClassName} db = this.baseMapper.selectById(${pkColumn.javaField});
- return BeanUtil.toBean(db, ${ClassName}Vo.class);
+ return getVoById(${pkColumn.javaField}, ${ClassName}Vo.class);
}
+
+#if($table.crud || $table.sub)
+ @Override
+ public TableDataInfo<${ClassName}Vo> queryPageList(${ClassName}QueryBo bo) {
+ PagePlus<${ClassName}, ${ClassName}Vo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo), ${ClassName}Vo.class);
+ return PageUtils.buildDataInfo(result);
+ }
+#end
@Override
public List<${ClassName}Vo> queryList(${ClassName}QueryBo bo) {
+ return listVo(buildQueryWrapper(bo), ${ClassName}Vo.class);
+ }
+
+ private LambdaQueryWrapper<${ClassName}> buildQueryWrapper(${ClassName}QueryBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<${ClassName}> lqw = Wrappers.lambdaQuery();
#foreach($column in $columns)
@@ -61,41 +74,21 @@
#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 lqw;
}
@Override
public Boolean insertByAddBo(${ClassName}AddBo bo) {
${ClassName} add = BeanUtil.toBean(bo, ${ClassName}.class);
validEntityBeforeSave(add);
- return this.save(add);
+ return save(add);
}
@Override
public Boolean updateByEditBo(${ClassName}EditBo bo) {
${ClassName} update = BeanUtil.toBean(bo, ${ClassName}.class);
validEntityBeforeSave(update);
- return this.updateById(update);
+ return updateById(update);
}
/**
@@ -112,6 +105,6 @@
if(isValid){
//TODO 鍋氫竴浜涗笟鍔′笂鐨勬牎楠�,鍒ゆ柇鏄惁闇�瑕佹牎楠�
}
- return this.removeByIds(ids);
+ return removeByIds(ids);
}
}
--
Gitblit v1.9.3