mirage
/
edu
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码生成器模板调整

This commit is contained in:
TinyAnts 2022-07-13 18:58:38 +08:00
parent 859397ea7c
commit 49496b852e
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java
View File

@ -47,8 +47,8 @@ public class VelocityUtil {
boolean isSearch = false;
List<String> fields = new LinkedList<>();
for (GenTableColumn column : columns) {
fields.add(column.getColumnName());
if (column.getIsQuery() == 1) {
fields.add(column.getColumnName());
isSearch = true;
}
}
@ -68,6 +68,7 @@ public class VelocityUtil {
velocityContext.put("fields", fields);
velocityContext.put("isSearch", isSearch);
velocityContext.put("isEqually", VelocityUtil.getIsEqually(columns));
System.out.println(fields);
return velocityContext;
}

8
server/like-generator/src/main/resources/java/serviceImpl.java.vm
View File

@ -85,7 +85,7 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service {
#if($column.javaField.equals($column.columnName))
"${column.queryType}:${column.javaField}:str",
#else
"${column.queryType}:${column.javaField}@${column.columnName}:str",
"${column.queryType.toLowerCase()}:${column.javaField}@${column.columnName}:str",
#end
#end
#end
@ -183,7 +183,7 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service {
#if($column.javaField.equals($column.columnName))
"${column.queryType}:${column.javaField}:str",
#else
"${column.queryType}:${column.javaField}@${column.columnName}:str",
"${column.queryType.toLowerCase()}:${column.javaField}@${column.columnName}:str",
#end
#end
#end
@ -250,7 +250,7 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service {
Integer limit = pageParam.getPageSize();
MPJQueryWrapper<${EntityName}> mpjQueryWrapper = new MPJQueryWrapper<>();
mpjQueryWrapper.leftJoin("${table.sub_table_name} f ON f.${table.sub_table_fk}=t.id")
mpjQueryWrapper.leftJoin("{$table.sub_table_name} f ON f.{$table.sub_table_fk}=t.id");
#if($isSearch)
#if($fields.contains("is_delete"))
mpjQueryWrapper.eq("is_delete", 0);
@ -285,7 +285,7 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service {
#if($column.javaField.equals($column.columnName))
"${column.queryType}:${column.javaField}:str",
#else
"${column.queryType}:${column.javaField}@${column.columnName}:str",
"${column.queryType.toLowerCase()}:${column.javaField}@${column.columnName}:str",
#end
#end
#end

6
server/like-generator/src/main/resources/java/validate.java.vm
View File

@ -29,14 +29,14 @@ public class ${EntityName}Param implements Serializable {
#if($column.isPk)
@IDMust(message = "${column.javaField}参数必传且需大于0", groups = {update.class, delete.class})
#end
#if(!$column.isPk && $column.isRequired)
#if(!$column.isPk && $column.isRequired && !$column.columnType.equals('text'))
@NotNull(message = "${column.javaField}参数缺失", groups = {#if($column.isInsert)create.class#end#if($column.isInsert&&$column.isEdit), #end#if($column.isEdit)update.class#end})
#end
#if(!$column.isPk && $column.javaType.equals("String"))
#if(!$column.isPk && $column.javaType.equals("String") && !$column.columnType.equals('text'))
@Length(max = ${column.columnLength}, message = "${column.javaField}参数不能超出${column.columnLength}个字符", groups = {#if($column.isInsert)create.class#end#if($column.isInsert&&$column.isEdit), #end#if($column.isEdit)update.class#end})
#end
#if(!$column.isPk && $column.javaField.substring(0,2)!="is" && ($column.javaType.equals("Integer") || $column.javaType.equals("Long")))
@DecimalMin(value = 0, message = "${column.javaField}参数值不能少于0", groups = {#if($column.isInsert)create.class#end#if($column.isInsert&&$column.isEdit), #end#if($column.isEdit)update.class#end})
@DecimalMin(value = "0", message = "${column.javaField}参数值不能少于0", groups = {#if($column.isInsert)create.class#end#if($column.isInsert&&$column.isEdit), #end#if($column.isEdit)update.class#end})
#end
#if(!$column.isPk && $column.javaField.substring(0,2)=="is" && $column.javaType.equals("Integer"))
@IntegerContains(values = {0, 1}, message = "${column.javaField}参数值不在符合范围", groups = {#if($column.isInsert)create.class#end#if($column.isInsert&&$column.isEdit), #end#if($column.isEdit)update.class#end})