From 5ffd61f25c4fd15632e8bb6e9bde98f213f41b6f Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Tue, 16 Aug 2022 16:08:54 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=94=9F=E6=88=90=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../generator/service/impl/GenerateServiceImpl.java | 2 +- .../java/com/hxkj/generator/util/VelocityUtil.java | 4 ++-- .../src/main/resources/vue/index-tree.vue.vm | 12 +++++------- .../src/main/resources/vue/index.vue.vm | 10 ++++------ 4 files changed, 12 insertions(+), 16 deletions(-) diff --git a/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java b/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java index b8a10b7b..37bbbd37 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java @@ -372,7 +372,7 @@ public class GenerateServiceImpl implements IGenerateService { Template tpl = Velocity.getTemplate(template, GenConstants.UTF8); tpl.merge(context, sw); map.put(template.replace(".vm", ""), sw.toString()); - System.out.println(sw); + // System.out.println(sw); } return map; diff --git a/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java b/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java index 7606fd87..b0f55d36 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java @@ -61,7 +61,7 @@ public class VelocityUtil { if (column.getIsPk() == 1) { primaryKey = column.getJavaField(); } - if (StringUtil.isNotEmpty(column.getDictType())) { + if (StringUtil.isNotEmpty(column.getDictType()) && !dictFields.contains(column.getDictType())) { dictFields.add(column.getDictType()); } } @@ -83,7 +83,7 @@ public class VelocityUtil { velocityContext.put("allFields", allFields); velocityContext.put("listFields", listFields); velocityContext.put("detailFields", detailFields); - velocityContext.put("dictFields", ArrayUtil.listToStringByStr(dictFields,",")); + velocityContext.put("dictFields", dictFields); velocityContext.put("isSearch", isSearch); return velocityContext; } diff --git a/server/like-generator/src/main/resources/vue/index-tree.vue.vm b/server/like-generator/src/main/resources/vue/index-tree.vue.vm index 29941b09..6f40fc89 100644 --- a/server/like-generator/src/main/resources/vue/index-tree.vue.vm +++ b/server/like-generator/src/main/resources/vue/index-tree.vue.vm @@ -159,15 +159,13 @@ loading.value = false } } + #if($dictFields.size()>=1) - #if($dictFields!="") const { dictData } = useDictData<{ - #foreach ($column in $columns) - #if($column.dictType!="") - ${column.dictType}: any[] - #end - #end - }>([${dictFields}]) + #foreach ($dict in $dictFields) + ${dict}: any[] + #end + }>([#foreach ($dict in $dictFields)'${dict}'#if($dictFields.size()>1),#end#end]) #end const handleAdd = async (${table.treePrimary}?: number) => { diff --git a/server/like-generator/src/main/resources/vue/index.vue.vm b/server/like-generator/src/main/resources/vue/index.vue.vm index c5c0ae14..0c81a047 100644 --- a/server/like-generator/src/main/resources/vue/index.vue.vm +++ b/server/like-generator/src/main/resources/vue/index.vue.vm @@ -151,15 +151,13 @@ fetchFun: ${moduleName}Lists, params: queryParams }) + #if($dictFields.size()>=1) - #if($dictFields!="") const { dictData } = useDictData<{ - #foreach ($column in $columns) - #if($column.dictType!="") - ${column.dictType}: any[] + #foreach ($dict in $dictFields) + ${dict}: any[] #end - #end - }>([${dictFields}]) + }>([#foreach ($dict in $dictFields)'${dict}'#if($dictFields.size()>1),#end#end]) #end const selectData = ref([]) From f4b3841f221d4aa8cf771fd81231da0f3221cf23 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Tue, 16 Aug 2022 16:20:42 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=94=9F=E6=88=90=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/like-generator/src/main/resources/vue/index-tree.vue.vm | 3 ++- server/like-generator/src/main/resources/vue/index.vue.vm | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/server/like-generator/src/main/resources/vue/index-tree.vue.vm b/server/like-generator/src/main/resources/vue/index-tree.vue.vm index 6f40fc89..823af8e7 100644 --- a/server/like-generator/src/main/resources/vue/index-tree.vue.vm +++ b/server/like-generator/src/main/resources/vue/index-tree.vue.vm @@ -160,12 +160,13 @@ } } #if($dictFields.size()>=1) + #set($dictSize = $dictFields.size() - 1) const { dictData } = useDictData<{ #foreach ($dict in $dictFields) ${dict}: any[] #end - }>([#foreach ($dict in $dictFields)'${dict}'#if($dictFields.size()>1),#end#end]) + }>([#foreach ($dict in $dictFields)'${dict}'#if($dictFields[$dictSize] != ${dict}),#end#end]) #end const handleAdd = async (${table.treePrimary}?: number) => { diff --git a/server/like-generator/src/main/resources/vue/index.vue.vm b/server/like-generator/src/main/resources/vue/index.vue.vm index 0c81a047..8f803f30 100644 --- a/server/like-generator/src/main/resources/vue/index.vue.vm +++ b/server/like-generator/src/main/resources/vue/index.vue.vm @@ -152,12 +152,13 @@ params: queryParams }) #if($dictFields.size()>=1) + #set($dictSize = $dictFields.size() - 1) const { dictData } = useDictData<{ #foreach ($dict in $dictFields) ${dict}: any[] #end - }>([#foreach ($dict in $dictFields)'${dict}'#if($dictFields.size()>1),#end#end]) + }>([#foreach ($dict in $dictFields)'${dict}'#if($dictFields[$dictSize] != ${dict}),#end#end]) #end const selectData = ref([]) From 2478c9240a55852dcc74a954e5706dca7aef6eec Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Tue, 16 Aug 2022 16:30:30 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=94=9F=E6=88=90=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../like-generator/src/main/resources/java/validate.java.vm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/server/like-generator/src/main/resources/java/validate.java.vm b/server/like-generator/src/main/resources/java/validate.java.vm index 9070f898..856dbcdb 100644 --- a/server/like-generator/src/main/resources/java/validate.java.vm +++ b/server/like-generator/src/main/resources/java/validate.java.vm @@ -24,8 +24,11 @@ public class ${EntityName}Param implements Serializable { public interface update{} public interface delete{} + @IDMust(message = "id参数必传且需大于0", groups = {update.class, delete.class}) + private Integer id; + #foreach ($column in $columns) - #if($column.isInsert || $column.isEdit) + #if(($column.isInsert || $column.isEdit) && $column.javaField!="id") #if($column.isPk) @IDMust(message = "${column.javaField}参数必传且需大于0", groups = {update.class, delete.class}) #end From 125a278eef54f76f9ca243e0ce388355bc6f051f Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Tue, 16 Aug 2022 16:45:09 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=94=9F=E6=88=90=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../like-generator/src/main/resources/java/validate.java.vm | 5 +---- .../like-generator/src/main/resources/java/voDetail.java.vm | 2 +- server/like-generator/src/main/resources/java/voList.java.vm | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/server/like-generator/src/main/resources/java/validate.java.vm b/server/like-generator/src/main/resources/java/validate.java.vm index 856dbcdb..21840b84 100644 --- a/server/like-generator/src/main/resources/java/validate.java.vm +++ b/server/like-generator/src/main/resources/java/validate.java.vm @@ -24,11 +24,8 @@ public class ${EntityName}Param implements Serializable { public interface update{} public interface delete{} - @IDMust(message = "id参数必传且需大于0", groups = {update.class, delete.class}) - private Integer id; - #foreach ($column in $columns) - #if(($column.isInsert || $column.isEdit) && $column.javaField!="id") + #if($column.isInsert || $column.isEdit || $column.isPk==1) #if($column.isPk) @IDMust(message = "${column.javaField}参数必传且需大于0", groups = {update.class, delete.class}) #end diff --git a/server/like-generator/src/main/resources/java/voDetail.java.vm b/server/like-generator/src/main/resources/java/voDetail.java.vm index 1cf85a3c..65b2870c 100644 --- a/server/like-generator/src/main/resources/java/voDetail.java.vm +++ b/server/like-generator/src/main/resources/java/voDetail.java.vm @@ -13,7 +13,7 @@ public class ${EntityName}DetailVo implements Serializable { private static final long serialVersionUID = 1L; #foreach ($column in $columns) -#if($column.isEdit==1) +#if($column.isEdit==1 || $column.isPk==1) #if($dateFields.contains($column.columnName)) private String ${column.javaField}; // ${column.columnComment} #else diff --git a/server/like-generator/src/main/resources/java/voList.java.vm b/server/like-generator/src/main/resources/java/voList.java.vm index 718284ca..45180d89 100644 --- a/server/like-generator/src/main/resources/java/voList.java.vm +++ b/server/like-generator/src/main/resources/java/voList.java.vm @@ -13,7 +13,7 @@ public class ${EntityName}ListVo implements Serializable { private static final long serialVersionUID = 1L; #foreach ($column in $columns) -#if($column.isList==1) +#if($column.isList==1 || $column.isPk==1) #if($dateFields.contains($column.columnName)) private String ${column.javaField}; // ${column.columnComment} #else