欧阳子桐 / RuoYi · 提交

转到一个项目

作者 RuoYi
提交 a1cc346acadeedf11f7b3d866d75500155619fde 1 个父辈 5397e345

优化代码生成模板

内嵌 并排对比
正在显示 7 个修改的文件 包含 35 行增加 和 33 行删除
@@ -6,6 +6,7 @@ import org.slf4j.LoggerFactory; @@ -6,6 +6,7 @@ import org.slf4j.LoggerFactory;
6 import com.ruoyi.common.constant.Constants; 6 import com.ruoyi.common.constant.Constants;
7 import com.ruoyi.common.utils.LogUtils; 7 import com.ruoyi.common.utils.LogUtils;
8 import com.ruoyi.common.utils.ServletUtils; 8 import com.ruoyi.common.utils.ServletUtils;
  9 +import com.ruoyi.common.utils.StringUtils;
9 import com.ruoyi.common.utils.ip.AddressUtils; 10 import com.ruoyi.common.utils.ip.AddressUtils;
10 import com.ruoyi.common.utils.ip.IpUtils; 11 import com.ruoyi.common.utils.ip.IpUtils;
11 import com.ruoyi.common.utils.spring.SpringUtils; 12 import com.ruoyi.common.utils.spring.SpringUtils;
@@ -280,7 +280,8 @@ public class VelocityUtils @@ -280,7 +280,8 @@ public class VelocityUtils
280 */ 280 */
281 public static String getParentMenuId(JSONObject paramsObj) 281 public static String getParentMenuId(JSONObject paramsObj)
282 { 282 {
283 - if (StringUtils.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.PARENT_MENU_ID)) 283 + if (StringUtils.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.PARENT_MENU_ID)
  284 + && StringUtils.isNotEmpty(paramsObj.getString(GenConstants.PARENT_MENU_ID)))
284 { 285 {
285 return paramsObj.getString(GenConstants.PARENT_MENU_ID); 286 return paramsObj.getString(GenConstants.PARENT_MENU_ID);
286 } 287 }
@@ -76,7 +76,7 @@ public class ${ClassName}Controller extends BaseController @@ -76,7 +76,7 @@ public class ${ClassName}Controller extends BaseController
76 @GetMapping(value = "/{${pkColumn.javaField}}") 76 @GetMapping(value = "/{${pkColumn.javaField}}")
77 public AjaxResult getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField}) 77 public AjaxResult getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField})
78 { 78 {
79 - return AjaxResult.success(${className}Service.select${ClassName}ById(${pkColumn.javaField})); 79 + return AjaxResult.success(${className}Service.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField}));
80 } 80 }
81 81
82 /** 82 /**
@@ -109,6 +109,6 @@ public class ${ClassName}Controller extends BaseController @@ -109,6 +109,6 @@ public class ${ClassName}Controller extends BaseController
109 @DeleteMapping("/{${pkColumn.javaField}s}") 109 @DeleteMapping("/{${pkColumn.javaField}s}")
110 public AjaxResult remove(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s) 110 public AjaxResult remove(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s)
111 { 111 {
112 - return toAjax(${className}Service.delete${ClassName}ByIds(${pkColumn.javaField}s)); 112 + return toAjax(${className}Service.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s));
113 } 113 }
114 } 114 }
@@ -17,10 +17,10 @@ public interface ${ClassName}Mapper @@ -17,10 +17,10 @@ public interface ${ClassName}Mapper
17 /** 17 /**
18 * 查询${functionName} 18 * 查询${functionName}
19 * 19 *
20 - * @param ${pkColumn.javaField} ${functionName}ID 20 + * @param ${pkColumn.javaField} ${functionName}主键
21 * @return ${functionName} 21 * @return ${functionName}
22 */ 22 */
23 - public ${ClassName} select${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField}); 23 + public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
24 24
25 /** 25 /**
26 * 查询${functionName}列表 26 * 查询${functionName}列表
@@ -49,27 +49,27 @@ public interface ${ClassName}Mapper @@ -49,27 +49,27 @@ public interface ${ClassName}Mapper
49 /** 49 /**
50 * 删除${functionName} 50 * 删除${functionName}
51 * 51 *
52 - * @param ${pkColumn.javaField} ${functionName}ID 52 + * @param ${pkColumn.javaField} ${functionName}主键
53 * @return 结果 53 * @return 结果
54 */ 54 */
55 - public int delete${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField}); 55 + public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
56 56
57 /** 57 /**
58 * 批量删除${functionName} 58 * 批量删除${functionName}
59 * 59 *
60 - * @param ${pkColumn.javaField}s 需要删除的数据ID 60 + * @param ${pkColumn.javaField}s 需要删除的数据主键集合
61 * @return 结果 61 * @return 结果
62 */ 62 */
63 - public int delete${ClassName}ByIds(${pkColumn.javaType}[] ${pkColumn.javaField}s); 63 + public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s);
64 #if($table.sub) 64 #if($table.sub)
65 65
66 /** 66 /**
67 * 批量删除${subTable.functionName} 67 * 批量删除${subTable.functionName}
68 * 68 *
69 - * @param customerIds 需要删除的数据ID 69 + * @param ${pkColumn.javaField}s 需要删除的数据主键集合
70 * @return 结果 70 * @return 结果
71 */ 71 */
72 - public int delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaType}[] ${pkColumn.javaField}s); 72 + public int delete${subClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s);
73 73
74 /** 74 /**
75 * 批量新增${subTable.functionName} 75 * 批量新增${subTable.functionName}
@@ -81,7 +81,7 @@ public interface ${ClassName}Mapper @@ -81,7 +81,7 @@ public interface ${ClassName}Mapper
81 81
82 82
83 /** 83 /**
84 - * 通过${functionName}ID删除${subTable.functionName}信息 84 + * 通过${functionName}主键删除${subTable.functionName}信息
85 * 85 *
86 * @param ${pkColumn.javaField} ${functionName}ID 86 * @param ${pkColumn.javaField} ${functionName}ID
87 * @return 结果 87 * @return 结果
@@ -14,10 +14,10 @@ public interface I${ClassName}Service @@ -14,10 +14,10 @@ public interface I${ClassName}Service
14 /** 14 /**
15 * 查询${functionName} 15 * 查询${functionName}
16 * 16 *
17 - * @param ${pkColumn.javaField} ${functionName}ID 17 + * @param ${pkColumn.javaField} ${functionName}主键
18 * @return ${functionName} 18 * @return ${functionName}
19 */ 19 */
20 - public ${ClassName} select${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField}); 20 + public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
21 21
22 /** 22 /**
23 * 查询${functionName}列表 23 * 查询${functionName}列表
@@ -46,16 +46,16 @@ public interface I${ClassName}Service @@ -46,16 +46,16 @@ public interface I${ClassName}Service
46 /** 46 /**
47 * 批量删除${functionName} 47 * 批量删除${functionName}
48 * 48 *
49 - * @param ${pkColumn.javaField}s 需要删除的${functionName}ID 49 + * @param ${pkColumn.javaField}s 需要删除的数据主键集合
50 * @return 结果 50 * @return 结果
51 */ 51 */
52 - public int delete${ClassName}ByIds(${pkColumn.javaType}[] ${pkColumn.javaField}s); 52 + public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s);
53 53
54 /** 54 /**
55 * 删除${functionName}信息 55 * 删除${functionName}信息
56 * 56 *
57 - * @param ${pkColumn.javaField} ${functionName}ID 57 + * @param ${pkColumn.javaField} ${functionName}主键
58 * @return 结果 58 * @return 结果
59 */ 59 */
60 - public int delete${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField}); 60 + public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
61 } 61 }
@@ -34,13 +34,13 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service @@ -34,13 +34,13 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
34 /** 34 /**
35 * 查询${functionName} 35 * 查询${functionName}
36 * 36 *
37 - * @param ${pkColumn.javaField} ${functionName}ID 37 + * @param ${pkColumn.javaField} ${functionName}主键
38 * @return ${functionName} 38 * @return ${functionName}
39 */ 39 */
40 @Override 40 @Override
41 - public ${ClassName} select${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField}) 41 + public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField})
42 { 42 {
43 - return ${className}Mapper.select${ClassName}ById(${pkColumn.javaField}); 43 + return ${className}Mapper.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField});
44 } 44 }
45 45
46 /** 46 /**
@@ -106,36 +106,36 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service @@ -106,36 +106,36 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
106 } 106 }
107 107
108 /** 108 /**
109 - * 批量删除${functionName} 109 + * 删除${functionName}对象
110 * 110 *
111 - * @param ${pkColumn.javaField}s 需要删除的${functionName}ID 111 + * @param ${pkColumn.javaField}s 需要删除的数据主键
112 * @return 结果 112 * @return 结果
113 */ 113 */
114 #if($table.sub) 114 #if($table.sub)
115 @Transactional 115 @Transactional
116 #end 116 #end
117 @Override 117 @Override
118 - public int delete${ClassName}ByIds(${pkColumn.javaType}[] ${pkColumn.javaField}s) 118 + public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s)
119 { 119 {
120 #if($table.sub) 120 #if($table.sub)
121 ${className}Mapper.delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaField}s); 121 ${className}Mapper.delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaField}s);
122 #end 122 #end
123 - return ${className}Mapper.delete${ClassName}ByIds(${pkColumn.javaField}s); 123 + return ${className}Mapper.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s);
124 } 124 }
125 125
126 /** 126 /**
127 * 删除${functionName}信息 127 * 删除${functionName}信息
128 * 128 *
129 - * @param ${pkColumn.javaField} ${functionName}ID 129 + * @param ${pkColumn.javaField} ${functionName}主键
130 * @return 结果 130 * @return 结果
131 */ 131 */
132 @Override 132 @Override
133 - public int delete${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField}) 133 + public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField})
134 { 134 {
135 #if($table.sub) 135 #if($table.sub)
136 ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${pkColumn.javaField}); 136 ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${pkColumn.javaField});
137 #end 137 #end
138 - return ${className}Mapper.delete${ClassName}ById(${pkColumn.javaField}); 138 + return ${className}Mapper.delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField});
139 } 139 }
140 #if($table.sub) 140 #if($table.sub)
141 141
@@ -147,7 +147,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service @@ -147,7 +147,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
147 public void insert${subClassName}(${ClassName} ${className}) 147 public void insert${subClassName}(${ClassName} ${className})
148 { 148 {
149 List<${subClassName}> ${subclassName}List = ${className}.get${subClassName}List(); 149 List<${subClassName}> ${subclassName}List = ${className}.get${subClassName}List();
150 - Long ${pkColumn.javaField} = ${className}.get${pkColumn.capJavaField}(); 150 + ${pkColumn.javaType} ${pkColumn.javaField} = ${className}.get${pkColumn.capJavaField}();
151 if (StringUtils.isNotNull(${subclassName}List)) 151 if (StringUtils.isNotNull(${subclassName}List))
152 { 152 {
153 List<${subClassName}> list = new ArrayList<${subClassName}>(); 153 List<${subClassName}> list = new ArrayList<${subClassName}>();
@@ -58,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -58,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
58 </where> 58 </where>
59 </select> 59 </select>
60 60
61 - <select id="select${ClassName}ById" parameterType="${pkColumn.javaType}" resultMap="#if($table.sub)${ClassName}${subClassName}Result#else${ClassName}Result#end"> 61 + <select id="select${ClassName}By${pkColumn.capJavaField}" parameterType="${pkColumn.javaType}" resultMap="#if($table.sub)${ClassName}${subClassName}Result#else${ClassName}Result#end">
62 #if($table.crud || $table.tree) 62 #if($table.crud || $table.tree)
63 <include refid="select${ClassName}Vo"/> 63 <include refid="select${ClassName}Vo"/>
64 where ${pkColumn.columnName} = #{${pkColumn.javaField}} 64 where ${pkColumn.columnName} = #{${pkColumn.javaField}}
@@ -102,11 +102,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -102,11 +102,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
102 where ${pkColumn.columnName} = #{${pkColumn.javaField}} 102 where ${pkColumn.columnName} = #{${pkColumn.javaField}}
103 </update> 103 </update>
104 104
105 - <delete id="delete${ClassName}ById" parameterType="${pkColumn.javaType}"> 105 + <delete id="delete${ClassName}By${pkColumn.capJavaField}" parameterType="${pkColumn.javaType}">
106 delete from ${tableName} where ${pkColumn.columnName} = #{${pkColumn.javaField}} 106 delete from ${tableName} where ${pkColumn.columnName} = #{${pkColumn.javaField}}
107 </delete> 107 </delete>
108 108
109 - <delete id="delete${ClassName}ByIds" parameterType="String"> 109 + <delete id="delete${ClassName}By${pkColumn.capJavaField}s" parameterType="String">
110 delete from ${tableName} where ${pkColumn.columnName} in 110 delete from ${tableName} where ${pkColumn.columnName} in
111 <foreach item="${pkColumn.javaField}" collection="array" open="(" separator="," close=")"> 111 <foreach item="${pkColumn.javaField}" collection="array" open="(" separator="," close=")">
112 #{${pkColumn.javaField}} 112 #{${pkColumn.javaField}}
@@ -121,7 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -121,7 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
121 </foreach> 121 </foreach>
122 </delete> 122 </delete>
123 123
124 - <delete id="delete${subClassName}By${subTableFkClassName}" parameterType="Long"> 124 + <delete id="delete${subClassName}By${subTableFkClassName}" parameterType="${pkColumn.javaType}">
125 delete from ${subTableName} where ${subTableFkName} = #{${subTableFkclassName}} 125 delete from ${subTableName} where ${subTableFkName} = #{${subTableFkclassName}}
126 </delete> 126 </delete>
127 127