From 857dec38d1554aade6fdf50013ec76a71db853b7 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 13 一月 2022 09:49:08 +0800
Subject: [PATCH] update 代码模板 适配新改动
---
ruoyi-generator/src/main/resources/vm/java/service.java.vm | 65 ++++++++++++++++----------------
ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm | 19 +++++----
ruoyi-generator/src/main/resources/vm/java/vo.java.vm | 10 ++--
3 files changed, 48 insertions(+), 46 deletions(-)
diff --git a/ruoyi-generator/src/main/resources/vm/java/service.java.vm b/ruoyi-generator/src/main/resources/vm/java/service.java.vm
index f93053c..4a3eb56 100644
--- a/ruoyi-generator/src/main/resources/vm/java/service.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/service.java.vm
@@ -3,7 +3,6 @@
import ${packageName}.domain.${ClassName};
import ${packageName}.domain.vo.${ClassName}Vo;
import ${packageName}.domain.bo.${ClassName}Bo;
-import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
#if($table.crud || $table.sub)
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.domain.PageQuery;
@@ -18,44 +17,44 @@
* @author ${author}
* @date ${datetime}
*/
-public interface I${ClassName}Service extends IServicePlus<${ClassName}, ${ClassName}Vo> {
- /**
- * 鏌ヨ鍗曚釜
- * @return
- */
- ${ClassName}Vo queryById(${pkColumn.javaType} ${pkColumn.javaField});
+public interface I${ClassName}Service {
+ /**
+ * 鏌ヨ鍗曚釜
+ * @return
+ */
+ ${ClassName}Vo queryById(${pkColumn.javaType} ${pkColumn.javaField});
#if($table.crud || $table.sub)
- /**
- * 鏌ヨ鍒楄〃
- */
+ /**
+ * 鏌ヨ鍒楄〃
+ */
TableDataInfo<${ClassName}Vo> queryPageList(${ClassName}Bo bo, PageQuery pageQuery);
#end
- /**
- * 鏌ヨ鍒楄〃
- */
- List<${ClassName}Vo> queryList(${ClassName}Bo bo);
+ /**
+ * 鏌ヨ鍒楄〃
+ */
+ List<${ClassName}Vo> queryList(${ClassName}Bo bo);
- /**
- * 鏍规嵁鏂板涓氬姟瀵硅薄鎻掑叆${functionName}
- * @param bo ${functionName}鏂板涓氬姟瀵硅薄
- * @return
- */
- Boolean insertByBo(${ClassName}Bo bo);
+ /**
+ * 鏍规嵁鏂板涓氬姟瀵硅薄鎻掑叆${functionName}
+ * @param bo ${functionName}鏂板涓氬姟瀵硅薄
+ * @return
+ */
+ Boolean insertByBo(${ClassName}Bo bo);
- /**
- * 鏍规嵁缂栬緫涓氬姟瀵硅薄淇敼${functionName}
- * @param bo ${functionName}缂栬緫涓氬姟瀵硅薄
- * @return
- */
- Boolean updateByBo(${ClassName}Bo bo);
+ /**
+ * 鏍规嵁缂栬緫涓氬姟瀵硅薄淇敼${functionName}
+ * @param bo ${functionName}缂栬緫涓氬姟瀵硅薄
+ * @return
+ */
+ Boolean updateByBo(${ClassName}Bo bo);
- /**
- * 鏍￠獙骞跺垹闄ゆ暟鎹�
- * @param ids 涓婚敭闆嗗悎
- * @param isValid 鏄惁鏍￠獙,true-鍒犻櫎鍓嶆牎楠�,false-涓嶆牎楠�
- * @return
- */
- Boolean deleteWithValidByIds(Collection<${pkColumn.javaType}> ids, Boolean isValid);
+ /**
+ * 鏍￠獙骞跺垹闄ゆ暟鎹�
+ * @param ids 涓婚敭闆嗗悎
+ * @param isValid 鏄惁鏍￠獙,true-鍒犻櫎鍓嶆牎楠�,false-涓嶆牎楠�
+ * @return
+ */
+ Boolean deleteWithValidByIds(Collection<${pkColumn.javaType}> ids, Boolean isValid);
}
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 bf20151..2ff5890 100644
--- a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
@@ -6,8 +6,8 @@
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.domain.PageQuery;
#end
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
-import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -27,19 +27,22 @@
* @author ${author}
* @date ${datetime}
*/
+@RequiredArgsConstructor
@Service
-public class ${ClassName}ServiceImpl extends ServicePlusImpl<${ClassName}Mapper, ${ClassName}, ${ClassName}Vo> implements I${ClassName}Service {
+public class ${ClassName}ServiceImpl implements I${ClassName}Service {
+
+ private final ${ClassName}Mapper baseMapper;
@Override
public ${ClassName}Vo queryById(${pkColumn.javaType} ${pkColumn.javaField}){
- return getVoById(${pkColumn.javaField});
+ return baseMapper.selectVoById(${pkColumn.javaField});
}
#if($table.crud || $table.sub)
@Override
public TableDataInfo<${ClassName}Vo> queryPageList(${ClassName}Bo bo, PageQuery pageQuery) {
LambdaQueryWrapper<${ClassName}> lqw = buildQueryWrapper(bo);
- Page<${ClassName}Vo> result = pageVo(pageQuery.build(), lqw);
+ Page<${ClassName}Vo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
#end
@@ -47,7 +50,7 @@
@Override
public List<${ClassName}Vo> queryList(${ClassName}Bo bo) {
LambdaQueryWrapper<${ClassName}> lqw = buildQueryWrapper(bo);
- return listVo(lqw);
+ return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<${ClassName}> buildQueryWrapper(${ClassName}Bo bo) {
@@ -81,7 +84,7 @@
public Boolean insertByBo(${ClassName}Bo bo) {
${ClassName} add = BeanUtil.toBean(bo, ${ClassName}.class);
validEntityBeforeSave(add);
- boolean flag = save(add);
+ boolean flag = baseMapper.insert(add);
#set($pk=$pkColumn.javaField.substring(0,1).toUpperCase() + ${pkColumn.javaField.substring(1)})
if (flag) {
bo.set$pk(add.get$pk());
@@ -93,7 +96,7 @@
public Boolean updateByBo(${ClassName}Bo bo) {
${ClassName} update = BeanUtil.toBean(bo, ${ClassName}.class);
validEntityBeforeSave(update);
- return updateById(update);
+ return baseMapper.updateById(update);
}
/**
@@ -110,6 +113,6 @@
if(isValid){
//TODO 鍋氫竴浜涗笟鍔′笂鐨勬牎楠�,鍒ゆ柇鏄惁闇�瑕佹牎楠�
}
- return removeByIds(ids);
+ return baseMapper.deleteBatchIds(ids) > 0;
}
}
diff --git a/ruoyi-generator/src/main/resources/vm/java/vo.java.vm b/ruoyi-generator/src/main/resources/vm/java/vo.java.vm
index 489723e..216e90f 100644
--- a/ruoyi-generator/src/main/resources/vm/java/vo.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/vo.java.vm
@@ -25,7 +25,7 @@
@ExcelIgnoreUnannotated
public class ${ClassName}Vo {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
#foreach ($column in $columns)
#if($column.isList)
@@ -42,13 +42,13 @@
@ExcelProperty(value = "${comment}", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "${column.dictType}")
#elseif($parentheseIndex != -1)
- @ExcelProperty(value = "${comment}", converter = ExcelDictConvert.class)
+ @ExcelProperty(value = "${comment}", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "$column.readConverterExp()")
#else
- @ExcelProperty(value = "${comment}")
+ @ExcelProperty(value = "${comment}")
#end
- @ApiModelProperty("$column.columnComment")
- private $column.javaType $column.javaField;
+ @ApiModelProperty("$column.columnComment")
+ private $column.javaType $column.javaField;
#end
#end
--
Gitblit v1.9.3