From fbabeb46a849385ac084f83ff7d916f8ceeb1dfc Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Wed, 13 Jul 2022 17:40:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/java/controller.java.vm | 10 ++- .../src/main/resources/java/service.java.vm | 12 +++- .../main/resources/java/serviceImpl.java.vm | 63 +++++++++++++++---- 3 files changed, 71 insertions(+), 14 deletions(-) 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 d2fd0922..1775c22f 100644 --- a/server/like-generator/src/main/resources/java/controller.java.vm +++ b/server/like-generator/src/main/resources/java/controller.java.vm @@ -42,7 +42,11 @@ public class ${EntityName}Controller { @GetMapping("/list") public Object list(@Validated PageParam pageParam, @RequestParam Map params) { + #if($isEqually) + PageResult<${EntityName}Vo> list = i${EntityName}Service.list(pageParam, params); + #else PageResult<${EntityName}ListVo> list = i${EntityName}Service.list(pageParam, params); + #end return AjaxResult.success(list); } @@ -57,7 +61,11 @@ public class ${EntityName}Controller { */ @GetMapping("/detail") public Object detail(@Validated @IDMust() @RequestParam("id") Integer id) { + #if($isEqually) ${EntityName}DetailVo detail = i${EntityName}Service.detail(id); + #else + ${EntityName}Vo detail = i${EntityName}Service.detail(id); + #end return AjaxResult.success(detail); } @@ -88,7 +96,7 @@ public class ${EntityName}Controller { */ @Log(title = "${functionName}编辑") @PostMapping("/edit") - public Object edit(@Validated(value = ${EntityName}Param.update.class}) @RequestBody ${EntityName}Param ${entityName}Param}) { + public Object edit(@Validated(value = ${EntityName}Param.update.class) @RequestBody ${EntityName}Param ${entityName}Param) { i${EntityName}Service.edit(${entityName}Param); return AjaxResult.success(); } 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 1626ed61..69867497 100644 --- a/server/like-generator/src/main/resources/java/service.java.vm +++ b/server/like-generator/src/main/resources/java/service.java.vm @@ -26,7 +26,11 @@ public interface I${EntityName}Service { * @param params 搜索参数 * @return PageResult<${EntityName}Vo}> */ - PageResult<${EntityName}ListVo> list(PageParam pageParam, Map params); + #if($isEqually) + PageResult<${EntityName}Vo> list(PageParam pageParam, Map params); + #else + PageResult<${EntityName}ListVo> list(PageParam pageParam, Map params); + #end #elseif($table.genTpl=="tree") /** * ${functionName}列表 @@ -49,7 +53,11 @@ public interface I${EntityName}Service { * @param id 主键ID * @return ${EntityName} */ - ${EntityName} detail(Integer id); + #if($isEqually) + ${EntityName}Vo detail(Integer id); + #else + ${EntityName}DetailVo detail(Integer id); + #end /** * ${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 9a3c9cfc..b561bf7a 100644 --- a/server/like-generator/src/main/resources/java/serviceImpl.java.vm +++ b/server/like-generator/src/main/resources/java/serviceImpl.java.vm @@ -48,7 +48,7 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { * @return PageResult<${EntityName}Vo> */ @Override - public PageResult<${EntityName}Vo> list(PageParam pageParam, Map params) { + public#if($isEqually) PageResult<${EntityName}Vo>#else PageResult<${EntityName}ListVo>#end list(PageParam pageParam, Map params) { Integer page = pageParam.getPageNo(); Integer limit = pageParam.getPageSize(); @@ -96,12 +96,24 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { }); #end + #if($isEqually) IPage<${EntityName}Vo> iPage = ${entityName}Mapper.selectPage(new Page<>(page, limit), queryWrapper); + #else + IPage<${EntityName}ListVo> iPage = ${entityName}Mapper.selectPage(new Page<>(page, limit), queryWrapper); + #end #if($fields.contains("create_time") || $fields.contains("update_time")) + #if($isEqually) List<${EntityName}Vo> list = new ArrayList<>(); + #else + List<${EntityName}ListVo> list = new ArrayList<>(); + #end for (${EntityName} item : iPage.getRecords()) { + #if($isEqually) ${EntityName}Vo vo = new ${EntityName}Vo(); + #else + ${EntityName}ListVo vo = new ${EntityName}ListVo(); + #end BeanUtils.copyProperties(item, vo); #if($fields.contains("image")) vo.setImage(UrlUtil.toAbsoluteUrl(vo.getImage)) @@ -184,9 +196,17 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { List<${EntityName}> arrayData = ${entityName}Mapper.selectList(queryWrapper); #if($fields.contains("create_time") || $fields.contains("update_time")) + #if($isEqually) List<${EntityName}Vo> list = new ArrayList<>(); + #else + List<${EntityName}ListVo> list = new ArrayList<>(); + #end for (${EntityName} item : arrayData) { + #if($isEqually) ${EntityName}Vo vo = new ${EntityName}Vo(); + #else + ${EntityName}ListVo vo = new ${EntityName}ListVo(); + #end BeanUtils.copyProperties(item, vo); #if($fields.contains("image")) vo.setImage(UrlUtil.toAbsoluteUrl(vo.getImage)) @@ -226,7 +246,7 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { * @return PageResult<${EntityName}Vo> */ @Override - public PageResult<${EntityName}Vo> list(PageParam pageParam, Map params) { + public#if($isEqually) PageResult<${EntityName}Vo>#else PageResult<${EntityName}ListVo>#end list(PageParam pageParam, Map params) { Integer page = pageParam.getPageNo(); Integer limit = pageParam.getPageSize(); @@ -275,15 +295,20 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { }); #end + #if($isEqually) IPage<${EntityName}Vo> iPage = ${entityName}Mapper.selectJoinPage( new Page<>(page, limit), ${EntityName}Vo.class, mpjQueryWrapper); + #else + IPage<${EntityName}ListVo> iPage = ${entityName}Mapper.selectJoinPage( + new Page<>(page, limit), + ${EntityName}ListVo.class, + mpjQueryWrapper); + #end #if($fields.contains("create_time") || $fields.contains("update_time")) - for (${EntityName} item : iPage.getRecords()) { - ${EntityName}Vo vo = new ${EntityName}Vo(); - BeanUtils.copyProperties(item, vo); + for (${EntityName} vo : iPage.getRecords()) { #if($fields.contains("image")) vo.setImage(UrlUtil.toAbsoluteUrl(vo.getImage)) #end @@ -348,13 +373,23 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { }); #end + #if($isEqually) List<${EntityName}> arrayData = ${entityName}Mapper.selectJoinList( ${EntityName}Vo.class, mpjQueryWrapper); + #else + List<${EntityNameList}> arrayData = ${entityName}Mapper.selectJoinList( + ${EntityName}ListVo.class, + mpjQueryWrapper); + #end #if($fields.contains("create_time") || $fields.contains("update_time")) for (${EntityName} item : arrayData) { + #if($isEqually) ${EntityName}Vo vo = new ${EntityName}Vo(); + #else + ${EntityName}ListVo vo = new ${EntityName}Vo(); + #end BeanUtils.copyProperties(item, vo); #if($fields.contains("image")) vo.setImage(UrlUtil.toAbsoluteUrl(vo.getImage)) @@ -391,7 +426,7 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { * @return ${EntityName} */ @Override - public ${EntityName} detail(Integer id) { + public#if($isEqually) ${EntityName}Vo#else ${EntityName}DetailVo#end detail(Integer id) { Article model = ${entityName}Mapper.selectOne( #if($field.contains("is_delete")) new QueryWrapper<${EntityName}>() @@ -406,16 +441,22 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { Assert.notNull(model, "${functionName}不存在}"); + #if($isEqually) + ArticleVo vo = new ArticleVo(); + #else + ArticleDetailVo vo = new ArticleDetailVo(); + #end + #if($field.contains("image")) - model.setImage(UrlUtil.toAbsoluteUrl(model.getImage())); + vo.setImage(UrlUtil.toAbsoluteUrl(model.getImage())); #end #if($field.contains("avatar")) - model.setAvatar(UrlUtil.toAbsoluteUrl(model.getAvatar())); + vo.setAvatar(UrlUtil.toAbsoluteUrl(model.getAvatar())); #end #if($field.contains("logo")) - model.setLogo(UrlUtil.toAbsoluteUrl(model.getLogo())); + vo.setLogo(UrlUtil.toAbsoluteUrl(model.getLogo())); #end - return model; + return vo; } /** @@ -454,7 +495,7 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service { */ @Override public void edit(${EntityName}Param ${entityName}Param) { - ${EntityName} model = ${entityName}Mapper.selectOne( + ${EntityName} model = ${entityName}Mapper.selectOne( #if($field.contains("is_delete")) new QueryWrapper<${EntityName}>() .eq("id", ${entityName}Param.getId())