From 3247a5f7d0a7d0fa6346bd3c511cae829d356481 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Wed, 16 Nov 2022 22:06:21 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BB=A3=E7=A0=81=E7=94=9F?= =?UTF-8?q?=E6=88=90=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/GenerateServiceImpl.java | 1 + .../java/com/mdd/generator/util/GenUtil.java | 2 +- .../com/mdd/generator/util/VelocityUtil.java | 5 +++- .../main/resources/java/controller.java.vm | 28 +++++++++---------- .../src/main/resources/java/service.java.vm | 7 ++--- .../main/resources/java/serviceImpl.java.vm | 7 +++-- 6 files changed, 27 insertions(+), 23 deletions(-) diff --git a/server/like-generator/src/main/java/com/mdd/generator/service/impl/GenerateServiceImpl.java b/server/like-generator/src/main/java/com/mdd/generator/service/impl/GenerateServiceImpl.java index 625adc43..dca64a4c 100644 --- a/server/like-generator/src/main/java/com/mdd/generator/service/impl/GenerateServiceImpl.java +++ b/server/like-generator/src/main/java/com/mdd/generator/service/impl/GenerateServiceImpl.java @@ -250,6 +250,7 @@ public class GenerateServiceImpl implements IGenerateService { Integer id = Integer.parseInt(item.get("id")); GenTableColumn column = genTableColumnMapper.selectById(id); column.setColumnComment(item.get("columnComment")); + column.setJavaType(item.get("javaType")); column.setJavaField(item.get("javaField")); column.setIsRequired(Integer.parseInt(item.get("isRequired"))); column.setIsInsert(Integer.parseInt(item.get("isInsert"))); diff --git a/server/like-generator/src/main/java/com/mdd/generator/util/GenUtil.java b/server/like-generator/src/main/java/com/mdd/generator/util/GenUtil.java index 9d8f50a0..1f1833c0 100644 --- a/server/like-generator/src/main/java/com/mdd/generator/util/GenUtil.java +++ b/server/like-generator/src/main/java/com/mdd/generator/util/GenUtil.java @@ -83,7 +83,7 @@ public class GenUtil { String[] str = StringUtil.split(StringUtil.substringBetween(column.getColumnType(), "(", ")"), ","); if (str != null && str.length == 2 && Integer.parseInt(str[1]) > 0) { column.setJavaType(JavaConstants.TYPE_BIG_DECIMAL); // 浮点形 - } else if (str != null && str.length == 1 && Integer.parseInt(str[0]) <= 10) { + } else if (str != null && str.length == 1 && Integer.parseInt(str[0]) <= 11) { column.setJavaType(JavaConstants.TYPE_INTEGER); // 整数形 } else { column.setJavaType(JavaConstants.TYPE_LONG); // 长整形 diff --git a/server/like-generator/src/main/java/com/mdd/generator/util/VelocityUtil.java b/server/like-generator/src/main/java/com/mdd/generator/util/VelocityUtil.java index 2eae1dc6..37b7436e 100644 --- a/server/like-generator/src/main/java/com/mdd/generator/util/VelocityUtil.java +++ b/server/like-generator/src/main/java/com/mdd/generator/util/VelocityUtil.java @@ -119,7 +119,7 @@ public class VelocityUtil { templates.add("java/serviceImpl.java.vm"); templates.add("java/validateCreate.java.vm"); templates.add("java/validateUpdate.java.vm"); -// templates.add("java/validateSearch.java.vm"); + templates.add("java/validateSearch.java.vm"); templates.add("java/voListed.java.vm"); templates.add("java/voDetail.java.vm"); templates.add("java/entity.java.vm"); @@ -165,6 +165,9 @@ public class VelocityUtil { fileName = StringUtil.format("java/{}/validate/{}UpdateValidate.java", GenConfig.adminPackage, entityName); } + else if (template.contains("validateSearch.java.vm")) { + fileName = StringUtil.format("java/{}/validate/{}SearchValidate.java", GenConfig.adminPackage, entityName); + } else if (template.contains("voListed.java.vm")) { fileName = StringUtil.format("java/{}/vo/{}ListedVo.java", GenConfig.adminPackage, entityName); diff --git a/server/like-generator/src/main/resources/java/controller.java.vm b/server/like-generator/src/main/resources/java/controller.java.vm index af41343d..b0233938 100644 --- a/server/like-generator/src/main/resources/java/controller.java.vm +++ b/server/like-generator/src/main/resources/java/controller.java.vm @@ -4,25 +4,25 @@ package ${packageName}.admin.controller; import com.alibaba.fastjson2.JSONArray; #end import ${packageName}.admin.config.aop.Log; -import ${packageName}.admin.service.${moduleName}.I${EntityName}Service; -import ${packageName}.admin.validate.${moduleName}.${EntityName}Param; +import ${packageName}.admin.service.I${EntityName}Service; +import ${packageName}.admin.validate.commons.IdValidate; +import ${packageName}.admin.validate.${EntityName}CreateValidate; +import ${packageName}.admin.validate.${EntityName}UpdateValidate; +import ${packageName}.admin.validate.${EntityName}SearchValidate; #if($table.genTpl.equals("crud")) -import ${packageName}.admin.validate.common.PageParam; -import ${packageName}.admin.vo.${moduleName}.${EntityName}ListVo; +import ${packageName}.admin.validate.commons.PageValidate; +import ${packageName}.admin.vo.${EntityName}ListedVo; #end -import ${packageName}.admin.vo.${moduleName}.${EntityName}DetailVo; +import ${packageName}.admin.vo.${EntityName}DetailVo; import ${packageName}.common.core.AjaxResult; #if($table.genTpl.equals("crud")) import ${packageName}.common.core.PageResult; #end import ${packageName}.common.validator.annotation.IDMust; -import com.mdd.common.core.AjaxResult; -import org.apache.commons.lang3.Validate; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.util.Map; #set($isAuthor = !$authorName.equals("")) /** @@ -45,16 +45,16 @@ public class ${EntityName}Controller { * @author ${authorName} #end #if($table.genTpl.equals("crud")) - * @param pageParam 分页参数 + * @param pageValidate 分页参数 #end - * @param params 搜索参数 - * @return Object + * @param searchValidate 搜索参数 + * @return AjaxResult */ #if($table.genTpl.equals("crud")) @GetMapping("/list") - public AjaxResult> list(@Validated PageParam pageParam, - @RequestParam Map params) { - PageResult<${EntityName}ListedVo> list = i${EntityName}Service.list(pageParam, params); + public AjaxResult> list(@Validated PageValidate pageValidate, + @Validated ${EntityName}SearchValidate searchValidate) { + PageResult<${EntityName}ListedVo> list = i${EntityName}Service.list(pageValidate, searchValidate); return AjaxResult.success(list); } #else diff --git a/server/like-generator/src/main/resources/java/service.java.vm b/server/like-generator/src/main/resources/java/service.java.vm index fee71ac4..b3a8cd86 100644 --- a/server/like-generator/src/main/resources/java/service.java.vm +++ b/server/like-generator/src/main/resources/java/service.java.vm @@ -6,12 +6,11 @@ import com.alibaba.fastjson2.JSONArray; import ${packageName}.admin.validate.commons.PageValidate; import ${packageName}.admin.validate.${EntityName}CreateValidate; import ${packageName}.admin.validate.${EntityName}UpdateValidate; +import ${packageName}.admin.validate.${EntityName}SearchValidate; import ${packageName}.admin.vo.${EntityName}ListedVo; import ${packageName}.admin.vo.${EntityName}DetailVo; import ${packageName}.common.core.PageResult; -import java.util.Map; - #set($isAuthor = !$authorName.equals("")) /** * ${functionName}服务接口类 @@ -29,10 +28,10 @@ public interface I${EntityName}Service { * @author ${authorName} #end * @param pageValidate 分页参数 - * @param params 搜索参数 + * @param searchValidate 搜索参数 * @return PageResult<${EntityName}ListedVo> */ - PageResult<${EntityName}ListedVo> list(PageValidate pageValidate, Map params); + PageResult<${EntityName}ListedVo> list(PageValidate pageValidate, ${EntityName}SearchValidate searchValidate); #elseif($table.genTpl=="tree") /** * ${functionName}列表 diff --git a/server/like-generator/src/main/resources/java/serviceImpl.java.vm b/server/like-generator/src/main/resources/java/serviceImpl.java.vm index da4c178e..43429fe1 100644 --- a/server/like-generator/src/main/resources/java/serviceImpl.java.vm +++ b/server/like-generator/src/main/resources/java/serviceImpl.java.vm @@ -11,6 +11,7 @@ import ${packageName}.admin.service.I${EntityName}Service; import ${packageName}.admin.validate.commons.PageValidate; import ${packageName}.admin.validate.${EntityName}CreateValidate; import ${packageName}.admin.validate.${EntityName}UpdateValidate; +import ${packageName}.admin.validate.${EntityName}SearchValidate; import ${packageName}.admin.vo.${EntityName}ListedVo; import ${packageName}.admin.vo.${EntityName}DetailVo; import ${packageName}.common.core.PageResult; @@ -41,7 +42,7 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { #set($genTpl = "PageResult<${EntityName}ListedVo>") #if($isSearch) #set($isSearchParam = true) - #set($genParam = "PageValidate pageValidate, Map params") + #set($genParam = "PageValidate pageValidate, ${EntityName}SearchValidate searchValidate") #else #set($isSearchParam = false) #set($genParam = "PageValidate pageValidate") @@ -58,7 +59,7 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { #end ## 设置基本的参数变量 #set($pageParam = "@param pageValidate 分页参数") - #set($searchparams = "@param params 搜索参数") + #set($searchparams = "@param searchValidate 搜索参数") @Resource ${EntityName}Mapper ${entityName}Mapper; @@ -110,7 +111,7 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { #end #if($isSearch) - ${entityName}Mapper.setSearch($queryWrapper, params, new String[]{ + ${entityName}Mapper.setSearch($queryWrapper, searchValidate, new String[]{ #foreach ($column in $columns) #if($column.isQuery) #if($dateFields.contains($column.columnName))