From afc4f9552fad069e045eaa4f5ecd7635c7d9ecdd Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 22 七月 2022 12:34:14 +0800
Subject: [PATCH] update 更改首页过时的技术
---
ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm | 102 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 64 insertions(+), 38 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 6a52f89..7767382 100644
--- a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
@@ -1,23 +1,25 @@
package ${packageName}.service.impl;
import cn.hutool.core.bean.BeanUtil;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.StringUtils;
+#if($table.crud || $table.sub)
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+#end
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import org.apache.commons.lang3.StringUtils;
-import ${packageName}.bo.${ClassName}AddBo;
-import ${packageName}.bo.${ClassName}QueryBo;
-import ${packageName}.bo.${ClassName}EditBo;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import ${packageName}.domain.bo.${ClassName}Bo;
+import ${packageName}.domain.vo.${ClassName}Vo;
import ${packageName}.domain.${ClassName};
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.stream.Collectors;
+import java.util.Map;
+import java.util.Collection;
/**
* ${functionName}Service涓氬姟灞傚鐞�
@@ -25,17 +27,43 @@
* @author ${author}
* @date ${datetime}
*/
+@RequiredArgsConstructor
@Service
-public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${ClassName}> implements I${ClassName}Service {
+public class ${ClassName}ServiceImpl implements I${ClassName}Service {
+ private final ${ClassName}Mapper baseMapper;
+
+ /**
+ * 鏌ヨ${functionName}
+ */
@Override
public ${ClassName}Vo queryById(${pkColumn.javaType} ${pkColumn.javaField}){
- ${ClassName} db = this.baseMapper.selectById(${pkColumn.javaField});
- return entity2Vo(Collections.singletonList(db)).get(0);
+ return baseMapper.selectVoById(${pkColumn.javaField});
}
+#if($table.crud || $table.sub)
+ /**
+ * 鏌ヨ${functionName}鍒楄〃
+ */
@Override
- public List<${ClassName}Vo> queryList(${ClassName}QueryBo bo) {
+ public TableDataInfo<${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);
+ }
+#end
+
+ /**
+ * 鏌ヨ${functionName}鍒楄〃
+ */
+ @Override
+ public List<${ClassName}Vo> queryList(${ClassName}Bo bo) {
+ LambdaQueryWrapper<${ClassName}> lqw = buildQueryWrapper(bo);
+ return baseMapper.selectVoList(lqw);
+ }
+
+ private LambdaQueryWrapper<${ClassName}> buildQueryWrapper(${ClassName}Bo bo) {
+ Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<${ClassName}> lqw = Wrappers.lambdaQuery();
#foreach($column in $columns)
#if($column.query)
@@ -53,56 +81,54 @@
#end
lqw.$mpMethod($condition, ${ClassName}::get$AttrName, bo.get$AttrName());
#else
- Map<String, Object> params = ${className}.getParams();
- if (params.get("begin$AttrName") != null && params.get("end$AttrName") != null) {
- lqw.between(${ClassName}::get$AttrName ,params.get("begin$AttrName"), params.get("end$AttrName"));
- }
+ lqw.between(params.get("begin$AttrName") != null && params.get("end$AttrName") != null,
+ ${ClassName}::get$AttrName ,params.get("begin$AttrName"), params.get("end$AttrName"));
#end
#end
#end
- return entity2Vo(this.list(lqw));
+ return lqw;
}
/**
- * 瀹炰綋绫昏浆鍖栨垚瑙嗗浘瀵硅薄
- *
- * @param collection 瀹炰綋绫婚泦鍚�
- * @return
- */
- private List<${ClassName}Vo> entity2Vo(Collection<${ClassName}> collection) {
- return collection.stream()
- .map(any -> BeanUtil.toBean(any, ${ClassName}Vo.class))
- .collect(Collectors.toList());
- }
-
+ * 鏂板${functionName}
+ */
@Override
- public Boolean insertByAddBo(${ClassName}AddBo bo) {
+ public Boolean insertByBo(${ClassName}Bo bo) {
${ClassName} add = BeanUtil.toBean(bo, ${ClassName}.class);
validEntityBeforeSave(add);
- return this.save(add);
+ boolean flag = baseMapper.insert(add) > 0;
+#set($pk=$pkColumn.javaField.substring(0,1).toUpperCase() + ${pkColumn.javaField.substring(1)})
+ if (flag) {
+ bo.set$pk(add.get$pk());
+ }
+ return flag;
}
+ /**
+ * 淇敼${functionName}
+ */
@Override
- public Boolean updateByEditBo(${ClassName}EditBo bo) {
+ public Boolean updateByBo(${ClassName}Bo bo) {
${ClassName} update = BeanUtil.toBean(bo, ${ClassName}.class);
validEntityBeforeSave(update);
- return this.updateById(update);
+ return baseMapper.updateById(update) > 0;
}
/**
* 淇濆瓨鍓嶇殑鏁版嵁鏍￠獙
- *
- * @param entity 瀹炰綋绫绘暟鎹�
*/
private void validEntityBeforeSave(${ClassName} entity){
//TODO 鍋氫竴浜涙暟鎹牎楠�,濡傚敮涓�绾︽潫
}
+ /**
+ * 鎵归噺鍒犻櫎${functionName}
+ */
@Override
- public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+ public Boolean deleteWithValidByIds(Collection<${pkColumn.javaType}> ids, Boolean isValid) {
if(isValid){
//TODO 鍋氫竴浜涗笟鍔′笂鐨勬牎楠�,鍒ゆ柇鏄惁闇�瑕佹牎楠�
}
- return this.removeByIds(ids);
+ return baseMapper.deleteBatchIds(ids) > 0;
}
}
--
Gitblit v1.9.3