ly
/
Stwzhj-Cloud-Plus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update 优化 代码生成 pr 代码

2.X
疯狂的狮子li 2022-02-14 16:01:53 +08:00
parent 1e22d7ce70
commit 43a7181fc7
2 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/service.java.vm
View File

@ -1,11 +1,11 @@
package ${packageName}.service; package ${packageName}.service;
import com.ruoyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.common.mybatis.core.page.TableDataInfo;
import ${packageName}.domain.${ClassName}; import ${packageName}.domain.${ClassName};
import ${packageName}.domain.vo.${ClassName}Vo; import ${packageName}.domain.vo.${ClassName}Vo;
import ${packageName}.domain.bo.${ClassName}Bo; import ${packageName}.domain.bo.${ClassName}Bo;
#if($table.crud || $table.sub) #if($table.crud || $table.sub)
import com.ruoyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.common.mybatis.core.page.TableDataInfo;
#end #end
import java.util.Collection; import java.util.Collection;

50
ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/serviceImpl.java.vm
View File

@ -5,12 +5,12 @@ import com.ruoyi.common.core.utils.StringUtils;
#if($table.crud || $table.sub) #if($table.crud || $table.sub)
import com.ruoyi.common.mybatis.core.page.PageQuery; import com.ruoyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.common.mybatis.core.page.TableDataInfo; import com.ruoyi.common.mybatis.core.page.TableDataInfo;
#end
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
#end
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import ${packageName}.domain.bo.${ClassName}Bo; import ${packageName}.domain.bo.${ClassName}Bo;
import ${packageName}.domain.vo.${ClassName}Vo; import ${packageName}.domain.vo.${ClassName}Vo;
import ${packageName}.domain.${ClassName}; import ${packageName}.domain.${ClassName};
@ -74,27 +74,27 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service {
private LambdaQueryWrapper<${ClassName}> buildQueryWrapper(${ClassName}Bo bo) { private LambdaQueryWrapper<${ClassName}> buildQueryWrapper(${ClassName}Bo bo) {
Map<String, Object> params = bo.getParams(); Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<${ClassName}> lqw = Wrappers.lambdaQuery(); LambdaQueryWrapper<${ClassName}> lqw = Wrappers.lambdaQuery();
#foreach($column in $columns) #foreach($column in $columns)
#if($column.query) #if($column.query)
#set($queryType=$column.queryType) #set($queryType=$column.queryType)
#set($javaField=$column.javaField) #set($javaField=$column.javaField)
#set($javaType=$column.javaType) #set($javaType=$column.javaType)
#set($columnName=$column.columnName) #set($columnName=$column.columnName)
#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
#set($mpMethod=$column.queryType.toLowerCase()) #set($mpMethod=$column.queryType.toLowerCase())
#if($queryType != 'BETWEEN') #if($queryType != 'BETWEEN')
#if($javaType == 'String') #if($javaType == 'String')
#set($condition='StringUtils.isNotBlank(bo.get'+$AttrName+'())') #set($condition='StringUtils.isNotBlank(bo.get'+$AttrName+'())')
#else #else
#set($condition='bo.get'+$AttrName+'() != null') #set($condition='bo.get'+$AttrName+'() != null')
#end #end
lqw.$mpMethod($condition, ${ClassName}::get$AttrName, bo.get$AttrName()); lqw.$mpMethod($condition, ${ClassName}::get$AttrName, bo.get$AttrName());
#else #else
lqw.between(params.get("begin$AttrName") != null && params.get("end$AttrName") != null, lqw.between(params.get("begin$AttrName") != null && params.get("end$AttrName") != null,
${ClassName}::get$AttrName ,params.get("begin$AttrName"), params.get("end$AttrName")); ${ClassName}::get$AttrName ,params.get("begin$AttrName"), params.get("end$AttrName"));
#end #end
#end #end
#end #end
return lqw; return lqw;
} }
@ -109,7 +109,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service {
${ClassName} add = BeanUtil.toBean(bo, ${ClassName}.class); ${ClassName} add = BeanUtil.toBean(bo, ${ClassName}.class);
validEntityBeforeSave(add); validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0; boolean flag = baseMapper.insert(add) > 0;
#set($pk=$pkColumn.javaField.substring(0,1).toUpperCase() + ${pkColumn.javaField.substring(1)}) #set($pk=$pkColumn.javaField.substring(0,1).toUpperCase() + ${pkColumn.javaField.substring(1)})
if (flag) { if (flag) {
bo.set$pk(add.get$pk()); bo.set$pk(add.get$pk());
} }