| src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/vm/java/controller.java.vm | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/vm/java/mapper.java.vm | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/vm/java/service.java.vm | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/vm/java/serviceImpl.java.vm | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/vm/xml/mapper.xml.vm | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java
@@ -6,6 +6,7 @@ import com.ruoyi.common.constant.Constants; import com.ruoyi.common.utils.LogUtils; import com.ruoyi.common.utils.ServletUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.ip.AddressUtils; import com.ruoyi.common.utils.ip.IpUtils; import com.ruoyi.common.utils.spring.SpringUtils; src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java
@@ -279,7 +279,8 @@ */ public static String getParentMenuId(JSONObject paramsObj) { if (StringUtils.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.PARENT_MENU_ID)) if (StringUtils.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.PARENT_MENU_ID) && StringUtils.isNotEmpty(paramsObj.getString(GenConstants.PARENT_MENU_ID))) { return paramsObj.getString(GenConstants.PARENT_MENU_ID); } src/main/resources/vm/java/controller.java.vm
@@ -76,7 +76,7 @@ @GetMapping(value = "/{${pkColumn.javaField}}") public AjaxResult getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField}) { return AjaxResult.success(${className}Service.select${ClassName}ById(${pkColumn.javaField})); return AjaxResult.success(${className}Service.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField})); } /** @@ -109,6 +109,6 @@ @DeleteMapping("/{${pkColumn.javaField}s}") public AjaxResult remove(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s) { return toAjax(${className}Service.delete${ClassName}ByIds(${pkColumn.javaField}s)); return toAjax(${className}Service.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s)); } } src/main/resources/vm/java/mapper.java.vm
@@ -17,10 +17,10 @@ /** * 查询${functionName} * * @param ${pkColumn.javaField} ${functionName}ID * @param ${pkColumn.javaField} ${functionName}主键 * @return ${functionName} */ public ${ClassName} select${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField}); public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}); /** * 查询${functionName}列表 @@ -49,27 +49,27 @@ /** * 删除${functionName} * * @param ${pkColumn.javaField} ${functionName}ID * @param ${pkColumn.javaField} ${functionName}主键 * @return 结果 */ public int delete${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField}); public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}); /** * 批量删除${functionName} * * @param ${pkColumn.javaField}s 需要删除的数据ID * @param ${pkColumn.javaField}s 需要删除的数据主键集合 * @return 结果 */ public int delete${ClassName}ByIds(${pkColumn.javaType}[] ${pkColumn.javaField}s); public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s); #if($table.sub) /** * 批量删除${subTable.functionName} * * @param customerIds 需要删除的数据ID * @param ${pkColumn.javaField}s 需要删除的数据主键集合 * @return 结果 */ public int delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaType}[] ${pkColumn.javaField}s); public int delete${subClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s); /** * 批量新增${subTable.functionName} @@ -81,7 +81,7 @@ /** * 通过${functionName}ID删除${subTable.functionName}信息 * 通过${functionName}主键删除${subTable.functionName}信息 * * @param ${pkColumn.javaField} ${functionName}ID * @return 结果 src/main/resources/vm/java/service.java.vm
@@ -14,10 +14,10 @@ /** * 查询${functionName} * * @param ${pkColumn.javaField} ${functionName}ID * @param ${pkColumn.javaField} ${functionName}主键 * @return ${functionName} */ public ${ClassName} select${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField}); public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}); /** * 查询${functionName}列表 @@ -46,16 +46,16 @@ /** * 批量删除${functionName} * * @param ${pkColumn.javaField}s 需要删除的${functionName}ID * @param ${pkColumn.javaField}s 需要删除的数据主键集合 * @return 结果 */ public int delete${ClassName}ByIds(${pkColumn.javaType}[] ${pkColumn.javaField}s); public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s); /** * 删除${functionName}信息 * * @param ${pkColumn.javaField} ${functionName}ID * @param ${pkColumn.javaField} ${functionName}主键 * @return 结果 */ public int delete${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField}); public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}); } src/main/resources/vm/java/serviceImpl.java.vm
@@ -34,13 +34,13 @@ /** * 查询${functionName} * * @param ${pkColumn.javaField} ${functionName}ID * @param ${pkColumn.javaField} ${functionName}主键 * @return ${functionName} */ @Override public ${ClassName} select${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField}) public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}) { return ${className}Mapper.select${ClassName}ById(${pkColumn.javaField}); return ${className}Mapper.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField}); } /** @@ -106,36 +106,36 @@ } /** * 批量删除${functionName} * 删除${functionName}对象 * * @param ${pkColumn.javaField}s 需要删除的${functionName}ID * @param ${pkColumn.javaField}s 需要删除的数据主键 * @return 结果 */ #if($table.sub) @Transactional #end @Override public int delete${ClassName}ByIds(${pkColumn.javaType}[] ${pkColumn.javaField}s) public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s) { #if($table.sub) ${className}Mapper.delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaField}s); #end return ${className}Mapper.delete${ClassName}ByIds(${pkColumn.javaField}s); return ${className}Mapper.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s); } /** * 删除${functionName}信息 * * @param ${pkColumn.javaField} ${functionName}ID * @param ${pkColumn.javaField} ${functionName}主键 * @return 结果 */ @Override public int delete${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField}) public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}) { #if($table.sub) ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${pkColumn.javaField}); #end return ${className}Mapper.delete${ClassName}ById(${pkColumn.javaField}); return ${className}Mapper.delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField}); } #if($table.sub) @@ -147,7 +147,7 @@ public void insert${subClassName}(${ClassName} ${className}) { List<${subClassName}> ${subclassName}List = ${className}.get${subClassName}List(); Long ${pkColumn.javaField} = ${className}.get${pkColumn.capJavaField}(); ${pkColumn.javaType} ${pkColumn.javaField} = ${className}.get${pkColumn.capJavaField}(); if (StringUtils.isNotNull(${subclassName}List)) { List<${subClassName}> list = new ArrayList<${subClassName}>(); src/main/resources/vm/xml/mapper.xml.vm
@@ -58,7 +58,7 @@ </where> </select> <select id="select${ClassName}ById" parameterType="${pkColumn.javaType}" resultMap="#if($table.sub)${ClassName}${subClassName}Result#else${ClassName}Result#end"> <select id="select${ClassName}By${pkColumn.capJavaField}" parameterType="${pkColumn.javaType}" resultMap="#if($table.sub)${ClassName}${subClassName}Result#else${ClassName}Result#end"> #if($table.crud || $table.tree) <include refid="select${ClassName}Vo"/> where ${pkColumn.columnName} = #{${pkColumn.javaField}} @@ -102,11 +102,11 @@ where ${pkColumn.columnName} = #{${pkColumn.javaField}} </update> <delete id="delete${ClassName}ById" parameterType="${pkColumn.javaType}"> <delete id="delete${ClassName}By${pkColumn.capJavaField}" parameterType="${pkColumn.javaType}"> delete from ${tableName} where ${pkColumn.columnName} = #{${pkColumn.javaField}} </delete> <delete id="delete${ClassName}ByIds" parameterType="String"> <delete id="delete${ClassName}By${pkColumn.capJavaField}s" parameterType="String"> delete from ${tableName} where ${pkColumn.columnName} in <foreach item="${pkColumn.javaField}" collection="array" open="(" separator="," close=")"> #{${pkColumn.javaField}} @@ -121,7 +121,7 @@ </foreach> </delete> <delete id="delete${subClassName}By${subTableFkClassName}" parameterType="Long"> <delete id="delete${subClassName}By${subTableFkClassName}" parameterType="${pkColumn.javaType}"> delete from ${subTableName} where ${subTableFkName} = #{${subTableFkclassName}} </delete>
