代码生成功能优化

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

@@ -3,10 +3,8 @@ package ${packageName}.service;
 import ${packageName}.domain.${ClassName};
 import ${packageName}.domain.vo.${ClassName}Vo;
 import ${packageName}.domain.bo.${ClassName}Bo;
-#if($table.crud)
-import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.common.mybatis.core.page.PageQuery;
-#end
+import ${packageName}.domain.${ClassName};
+import org.dromara.server.base.IBaseService;
 
 import java.util.Collection;
 import java.util.List;
@@ -17,57 +15,7 @@ import java.util.List;
  * @author ${author}
  * @date ${datetime}
  */
-public interface I${ClassName}Service {
-
-    /**
-     * 查询${functionName}
-     *
-     * @param ${pkColumn.javaField} 主键
-     * @return ${functionName}
-     */
-    ${ClassName}Vo queryById(${pkColumn.javaType} ${pkColumn.javaField});
-
-#if($table.crud)
-    /**
-     * 分页查询${functionName}列表
-     *
-     * @param bo        查询条件
-     * @param pageQuery 分页参数
-     * @return ${functionName}分页列表
-     */
-    TableDataInfo<${ClassName}Vo> queryPageList(${ClassName}Bo bo, PageQuery pageQuery);
-#end
-
-    /**
-     * 查询符合条件的${functionName}列表
-     *
-     * @param bo 查询条件
-     * @return ${functionName}列表
-     */
-    List<${ClassName}Vo> queryList(${ClassName}Bo bo);
-
-    /**
-     * 新增${functionName}
-     *
-     * @param bo ${functionName}
-     * @return 是否新增成功
-     */
-    Boolean insertByBo(${ClassName}Bo bo);
+public interface I${ClassName}Service extends IBaseService<${ClassName}Vo, ${ClassName}Bo, ${ClassName}>{
 
-    /**
-     * 修改${functionName}
-     *
-     * @param bo ${functionName}
-     * @return 是否修改成功
-     */
-    Boolean updateByBo(${ClassName}Bo bo);
 
-    /**
-     * 校验并批量删除${functionName}信息
-     *
-     * @param ids     待删除的主键集合
-     * @param isValid 是否进行有效性校验
-     * @return 是否删除成功
-     */
-    Boolean deleteWithValidByIds(Collection<${pkColumn.javaType}> ids, Boolean isValid);
 }

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

@@ -16,6 +16,8 @@ import ${packageName}.domain.vo.${ClassName}Vo;
 import ${packageName}.domain.${ClassName};
 import ${packageName}.mapper.${ClassName}Mapper;
 import ${packageName}.service.I${ClassName}Service;
+import org.dromara.server.base.AbstractBaseService;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
 import java.util.List;
 import java.util.Map;
@@ -29,50 +31,17 @@ import java.util.Collection;
  */
 @RequiredArgsConstructor
 @Service
-public class ${ClassName}ServiceImpl implements I${ClassName}Service {
+public class ${ClassName}ServiceImpl extends AbstractBaseService<${ClassName}Vo, ${ClassName}Bo, ${ClassName}> implements I${ClassName}Service {
 
     private final ${ClassName}Mapper baseMapper;
 
-    /**
-     * 查询${functionName}
-     *
-     * @param ${pkColumn.javaField} 主键
-     * @return ${functionName}
-     */
     @Override
-    public ${ClassName}Vo queryById(${pkColumn.javaType} ${pkColumn.javaField}){
-        return baseMapper.selectVoById(${pkColumn.javaField});
+    public BaseMapperPlus<${ClassName}, ${ClassName}Vo> mapper() {
+        return baseMapper;
     }
 
-#if($table.crud)
-    /**
-     * 分页查询${functionName}列表
-     *
-     * @param bo        查询条件
-     * @param pageQuery 分页参数
-     * @return ${functionName}分页列表
-     */
-    @Override
-    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}列表
-     *
-     * @param bo 查询条件
-     * @return ${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) {
+    public LambdaQueryWrapper<${ClassName}> buildQueryWrapper(${ClassName}Bo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<${ClassName}> lqw = Wrappers.lambdaQuery();
 #foreach($column in $columns)
@@ -99,56 +68,4 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service {
         return lqw;
     }
 
-    /**
-     * 新增${functionName}
-     *
-     * @param bo ${functionName}
-     * @return 是否新增成功
-     */
-    @Override
-    public Boolean insertByBo(${ClassName}Bo bo) {
-        ${ClassName} add = MapstructUtils.convert(bo, ${ClassName}.class);
-        validEntityBeforeSave(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}
-     *
-     * @param bo ${functionName}
-     * @return 是否修改成功
-     */
-    @Override
-    public Boolean updateByBo(${ClassName}Bo bo) {
-        ${ClassName} update = MapstructUtils.convert(bo, ${ClassName}.class);
-        validEntityBeforeSave(update);
-        return baseMapper.updateById(update) > 0;
-    }
-
-    /**
-     * 保存前的数据校验
-     */
-    private void validEntityBeforeSave(${ClassName} entity){
-        //TODO 做一些数据校验,如唯一约束
-    }
-
-    /**
-     * 校验并批量删除${functionName}信息
-     *
-     * @param ids     待删除的主键集合
-     * @param isValid 是否进行有效性校验
-     * @return 是否删除成功
-     */
-    @Override
-    public Boolean deleteWithValidByIds(Collection<${pkColumn.javaType}> ids, Boolean isValid) {
-        if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
-        }
-        return baseMapper.deleteByIds(ids) > 0;
-    }
 }