ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
@@ -78,14 +78,14 @@ public static void setMenuVelocityContext(VelocityContext context, GenTable genTable) { String options = genTable.getOptions(); Map<String, Object> paramsObj = JsonUtils.parseMap(options); Map<String, String> paramsObj = JsonUtils.parseMap(options); String parentMenuId = getParentMenuId(paramsObj); context.put("parentMenuId", parentMenuId); } public static void setTreeVelocityContext(VelocityContext context, GenTable genTable) { String options = genTable.getOptions(); Map<String, Object> paramsObj = JsonUtils.parseMap(options); Map<String, String> paramsObj = JsonUtils.parseMap(options); String treeCode = getTreecode(paramsObj); String treeParentCode = getTreeParentCode(paramsObj); String treeName = getTreeName(paramsObj); @@ -270,9 +270,9 @@ * @param paramsObj 生成其他选项 * @return 上级菜单ID字段 */ public static String getParentMenuId(Map<String, Object> paramsObj) { public static String getParentMenuId(Map<String, String> paramsObj) { if (CollUtil.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.PARENT_MENU_ID) && StringUtils.isNotEmpty(Convert.toStr(paramsObj.get(GenConstants.PARENT_MENU_ID)))) { && StringUtils.isNotEmpty(paramsObj.get(GenConstants.PARENT_MENU_ID))) { return Convert.toStr(paramsObj.get(GenConstants.PARENT_MENU_ID)); } return DEFAULT_PARENT_MENU_ID; @@ -284,9 +284,9 @@ * @param paramsObj 生成其他选项 * @return 树编码 */ public static String getTreecode(Map<String, Object> paramsObj) { public static String getTreecode(Map<String, String> paramsObj) { if (CollUtil.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.TREE_CODE)) { return StringUtils.toCamelCase(Convert.toStr(paramsObj.get(GenConstants.TREE_CODE))); return StringUtils.toCamelCase(paramsObj.get(GenConstants.TREE_CODE)); } return StringUtils.EMPTY; } @@ -297,9 +297,9 @@ * @param paramsObj 生成其他选项 * @return 树父编码 */ public static String getTreeParentCode(Map<String, Object> paramsObj) { public static String getTreeParentCode(Map<String, String> paramsObj) { if (CollUtil.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.TREE_PARENT_CODE)) { return StringUtils.toCamelCase(Convert.toStr(paramsObj.get(GenConstants.TREE_PARENT_CODE))); return StringUtils.toCamelCase(paramsObj.get(GenConstants.TREE_PARENT_CODE)); } return StringUtils.EMPTY; } @@ -310,9 +310,9 @@ * @param paramsObj 生成其他选项 * @return 树名称 */ public static String getTreeName(Map<String, Object> paramsObj) { public static String getTreeName(Map<String, String> paramsObj) { if (CollUtil.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.TREE_NAME)) { return StringUtils.toCamelCase(Convert.toStr(paramsObj.get(GenConstants.TREE_NAME))); return StringUtils.toCamelCase(paramsObj.get(GenConstants.TREE_NAME)); } return StringUtils.EMPTY; } @@ -325,8 +325,8 @@ */ public static int getExpandColumn(GenTable genTable) { String options = genTable.getOptions(); Map<String, Object> paramsObj = JsonUtils.parseMap(options); String treeName = Convert.toStr(paramsObj.get(GenConstants.TREE_NAME)); Map<String, String> paramsObj = JsonUtils.parseMap(options); String treeName = paramsObj.get(GenConstants.TREE_NAME); int num = 0; for (GenTableColumn column : genTable.getColumns()) { if (column.isList()) { ruoyi-generator/src/main/resources/vm/java/service.java.vm
@@ -18,43 +18,55 @@ * @date ${datetime} */ public interface I${ClassName}Service { /** * 查询单个 * @return * 查询${functionName} * * @param ${pkColumn.javaField} ${functionName}主键 * @return ${functionName} */ ${ClassName}Vo queryById(${pkColumn.javaType} ${pkColumn.javaField}); #if($table.crud || $table.sub) /** * 查询列表 * 查询${functionName}列表 * * @param ${className} ${functionName} * @return ${functionName}集合 */ TableDataInfo<${ClassName}Vo> queryPageList(${ClassName}Bo bo, PageQuery pageQuery); #end /** * 查询列表 * 查询${functionName}列表 * * @param ${className} ${functionName} * @return ${functionName}集合 */ List<${ClassName}Vo> queryList(${ClassName}Bo bo); /** * 根据新增业务对象插入${functionName} * @param bo ${functionName}新增业务对象 * @return * 修改${functionName} * * @param ${className} ${functionName} * @return 结果 */ Boolean insertByBo(${ClassName}Bo bo); /** * 根据编辑业务对象修改${functionName} * @param bo ${functionName}编辑业务对象 * @return * 修改${functionName} * * @param ${className} ${functionName} * @return 结果 */ Boolean updateByBo(${ClassName}Bo bo); /** * 校验并删除数据 * @param ids 主键集合 * 校验并批量删除${functionName}信息 * * @param ${pkColumn.javaField}s 需要删除的${functionName}主键集合 * @param isValid 是否校验,true-删除前校验,false-不校验 * @return * @return 结果 */ Boolean deleteWithValidByIds(Collection<${pkColumn.javaType}> ids, Boolean isValid); } ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
@@ -5,12 +5,12 @@ #if($table.crud || $table.sub) 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.baomidou.mybatisplus.extension.plugins.pagination.Page; #end import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import ${packageName}.domain.bo.${ClassName}Bo; import ${packageName}.domain.vo.${ClassName}Vo; import ${packageName}.domain.${ClassName}; @@ -33,12 +33,24 @@ private final ${ClassName}Mapper baseMapper; /** * 查询${functionName} * * @param ${pkColumn.javaField} ${functionName}主键 * @return ${functionName} */ @Override public ${ClassName}Vo queryById(${pkColumn.javaType} ${pkColumn.javaField}){ return baseMapper.selectVoById(${pkColumn.javaField}); } #if($table.crud || $table.sub) /** * 查询${functionName}列表 * * @param ${className} ${functionName} * @return ${functionName} */ @Override public TableDataInfo<${ClassName}Vo> queryPageList(${ClassName}Bo bo, PageQuery pageQuery) { LambdaQueryWrapper<${ClassName}> lqw = buildQueryWrapper(bo); @@ -47,6 +59,12 @@ } #end /** * 查询${functionName}列表 * * @param ${className} ${functionName} * @return ${functionName} */ @Override public List<${ClassName}Vo> queryList(${ClassName}Bo bo) { LambdaQueryWrapper<${ClassName}> lqw = buildQueryWrapper(bo); @@ -80,6 +98,12 @@ return lqw; } /** * 新增${functionName} * * @param ${className} ${functionName} * @return 结果 */ @Override public Boolean insertByBo(${ClassName}Bo bo) { ${ClassName} add = BeanUtil.toBean(bo, ${ClassName}.class); @@ -92,6 +116,12 @@ return flag; } /** * 修改${functionName} * * @param ${className} ${functionName} * @return 结果 */ @Override public Boolean updateByBo(${ClassName}Bo bo) { ${ClassName} update = BeanUtil.toBean(bo, ${ClassName}.class); @@ -108,6 +138,12 @@ //TODO 做一些数据校验,如唯一约束 } /** * 批量删除${functionName} * * @param ${pkColumn.javaField}s 需要删除的${functionName}主键 * @return 结果 */ @Override public Boolean deleteWithValidByIds(Collection<${pkColumn.javaType}> ids, Boolean isValid) { if(isValid){
