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

Merge branch 'develop' of https://gitee.com/likeshop_gitee/likeadmin-java into develop

This commit is contained in:
Jason 2022-08-16 17:01:36 +08:00
parent 63856cde0e 125a278eef
commit 76293ed831
7 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java
View File

@ -372,7 +372,7 @@ public class GenerateServiceImpl implements IGenerateService {
Template tpl = Velocity.getTemplate(template, GenConstants.UTF8); Template tpl = Velocity.getTemplate(template, GenConstants.UTF8);
tpl.merge(context, sw); tpl.merge(context, sw);
map.put(template.replace(".vm", ""), sw.toString()); map.put(template.replace(".vm", ""), sw.toString());
System.out.println(sw); // System.out.println(sw);
} }
return map; return map;

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

@ -61,7 +61,7 @@ public class VelocityUtil {
if (column.getIsPk() == 1) { if (column.getIsPk() == 1) {
primaryKey = column.getJavaField(); primaryKey = column.getJavaField();
} }
if (StringUtil.isNotEmpty(column.getDictType())) { if (StringUtil.isNotEmpty(column.getDictType()) && !dictFields.contains(column.getDictType())) {
dictFields.add(column.getDictType()); dictFields.add(column.getDictType());
} }
} }
@ -83,7 +83,7 @@ public class VelocityUtil {
velocityContext.put("allFields", allFields); velocityContext.put("allFields", allFields);
velocityContext.put("listFields", listFields); velocityContext.put("listFields", listFields);
velocityContext.put("detailFields", detailFields); velocityContext.put("detailFields", detailFields);
velocityContext.put("dictFields", ArrayUtil.listToStringByStr(dictFields,",")); velocityContext.put("dictFields", dictFields);
velocityContext.put("isSearch", isSearch); velocityContext.put("isSearch", isSearch);
return velocityContext; return velocityContext;
} }

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

@ -25,7 +25,7 @@ public class ${EntityName}Param implements Serializable {
public interface delete{} public interface delete{}
#foreach ($column in $columns) #foreach ($column in $columns)
#if($column.isInsert || $column.isEdit) #if($column.isInsert || $column.isEdit || $column.isPk==1)
#if($column.isPk) #if($column.isPk)
@IDMust(message = "${column.javaField}参数必传且需大于0", groups = {update.class, delete.class}) @IDMust(message = "${column.javaField}参数必传且需大于0", groups = {update.class, delete.class})
#end #end

2
server/like-generator/src/main/resources/java/voDetail.java.vm
View File

@ -13,7 +13,7 @@ public class ${EntityName}DetailVo implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
#foreach ($column in $columns) #foreach ($column in $columns)
#if($column.isEdit==1) #if($column.isEdit==1 || $column.isPk==1)
#if($dateFields.contains($column.columnName)) #if($dateFields.contains($column.columnName))
private String ${column.javaField}; // ${column.columnComment} private String ${column.javaField}; // ${column.columnComment}
#else #else

2
server/like-generator/src/main/resources/java/voList.java.vm
View File

@ -13,7 +13,7 @@ public class ${EntityName}ListVo implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
#foreach ($column in $columns) #foreach ($column in $columns)
#if($column.isList==1) #if($column.isList==1 || $column.isPk==1)
#if($dateFields.contains($column.columnName)) #if($dateFields.contains($column.columnName))
private String ${column.javaField}; // ${column.columnComment} private String ${column.javaField}; // ${column.columnComment}
#else #else

13
server/like-generator/src/main/resources/vue/index-tree.vue.vm
View File

@ -159,15 +159,14 @@
loading.value = false loading.value = false
} }
} }
#if($dictFields.size()>=1)
#set($dictSize = $dictFields.size() - 1)
#if($dictFields!="")
const { dictData } = useDictData<{ const { dictData } = useDictData<{
#foreach ($column in $columns) #foreach ($dict in $dictFields)
#if($column.dictType!="") ${dict}: any[]
${column.dictType}: any[] #end
#end }>([#foreach ($dict in $dictFields)'${dict}'#if($dictFields[$dictSize] != ${dict}),#end#end])
#end
}>([${dictFields}])
#end #end
const handleAdd = async (${table.treePrimary}?: number) => { const handleAdd = async (${table.treePrimary}?: number) => {

11
server/like-generator/src/main/resources/vue/index.vue.vm
View File

@ -151,15 +151,14 @@
fetchFun: ${moduleName}Lists, fetchFun: ${moduleName}Lists,
params: queryParams params: queryParams
}) })
#if($dictFields.size()>=1)
#set($dictSize = $dictFields.size() - 1)
#if($dictFields!="")
const { dictData } = useDictData<{ const { dictData } = useDictData<{
#foreach ($column in $columns) #foreach ($dict in $dictFields)
#if($column.dictType!="") ${dict}: any[]
${column.dictType}: any[]
#end #end
#end }>([#foreach ($dict in $dictFields)'${dict}'#if($dictFields[$dictSize] != ${dict}),#end#end])
}>([${dictFields}])
#end #end
const selectData = ref<any[]>([]) const selectData = ref<any[]>([])