From 2c6c24bf2ced30dac645995c11a5c8a72d4ad264 Mon Sep 17 00:00:00 2001 From: zlt Date: Fri, 4 Oct 2019 16:03:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E7=94=9F?= =?UTF-8?q?=E6=88=90=E5=99=A8=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/template/Controller.java.vm | 14 ++++++------ .../main/resources/template/Mapper.java.vm | 5 ++--- .../src/main/resources/template/Mapper.xml.vm | 1 - .../src/main/resources/template/Model.java.vm | 4 ++-- .../main/resources/template/Service.java.vm | 7 +++--- .../resources/template/ServiceImpl.java.vm | 22 ++++++------------- 6 files changed, 21 insertions(+), 32 deletions(-) diff --git a/zlt-business/code-generator/src/main/resources/template/Controller.java.vm b/zlt-business/code-generator/src/main/resources/template/Controller.java.vm index 395db30..dad9d71 100644 --- a/zlt-business/code-generator/src/main/resources/template/Controller.java.vm +++ b/zlt-business/code-generator/src/main/resources/template/Controller.java.vm @@ -11,7 +11,7 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import ${package}.${moduleName}.model.${className}; -import ${package}.${moduleName}.service.${className}Service; +import ${package}.${moduleName}.service.I${className}Service; import com.central.common.model.PageResult; import com.central.common.model.Result; @@ -37,7 +37,7 @@ public class ${className}Controller { @ApiImplicitParam(name = "page", value = "分页起始位置", required = true, dataType = "Integer"), @ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer") }) - @GetMapping("/${className}") + @GetMapping public PageResult list(@RequestParam Map params) { return ${classname}Service.findList(params); } @@ -46,9 +46,9 @@ public class ${className}Controller { * 查询 */ @ApiOperation(value = "查询") - @GetMapping("/${className}/{id}") + @GetMapping("/{${pk.attrname}}") public Result findUserById(@PathVariable Long ${pk.attrname}) { - ${className} model = ${classname}Service.getById(id); + ${className} model = ${classname}Service.getById(${pk.attrname}); return Result.succeed(model, "查询成功"); } @@ -56,9 +56,9 @@ public class ${className}Controller { * 新增or更新 */ @ApiOperation(value = "保存") - @PostMapping("/${className}") + @PostMapping public Result save(@RequestBody ${className} ${classname}) { - ${classname}Service.saveOrUpdateUser(${classname}); + ${classname}Service.saveOrUpdate(${classname}); return Result.succeed("保存成功"); } @@ -66,7 +66,7 @@ public class ${className}Controller { * 删除 */ @ApiOperation(value = "删除") - @DeleteMapping("/${className}/{id}") + @DeleteMapping("/{id}") public Result delete(@PathVariable Long ${pk.attrname}) { ${classname}Service.removeById(${pk.attrname}); return Result.succeed("删除成功"); diff --git a/zlt-business/code-generator/src/main/resources/template/Mapper.java.vm b/zlt-business/code-generator/src/main/resources/template/Mapper.java.vm index 43dc151..bcb6f90 100644 --- a/zlt-business/code-generator/src/main/resources/template/Mapper.java.vm +++ b/zlt-business/code-generator/src/main/resources/template/Mapper.java.vm @@ -1,6 +1,6 @@ -package ${package}.${moduleName}.dao; +package ${package}.${moduleName}.mapper; -import ${package}.${moduleName}.entity.${className}; +import ${package}.${moduleName}.model.${className}; import com.central.db.mapper.SuperMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; @@ -14,7 +14,6 @@ import java.util.Map; * @author ${author} * @date ${datetime} */ -@Mapper public interface ${className}Mapper extends SuperMapper<${className}> { /** * 分页查询用户列表 diff --git a/zlt-business/code-generator/src/main/resources/template/Mapper.xml.vm b/zlt-business/code-generator/src/main/resources/template/Mapper.xml.vm index 532f39b..bc5b620 100644 --- a/zlt-business/code-generator/src/main/resources/template/Mapper.xml.vm +++ b/zlt-business/code-generator/src/main/resources/template/Mapper.xml.vm @@ -4,6 +4,5 @@ \ No newline at end of file diff --git a/zlt-business/code-generator/src/main/resources/template/Model.java.vm b/zlt-business/code-generator/src/main/resources/template/Model.java.vm index 28f260d..cb57c39 100644 --- a/zlt-business/code-generator/src/main/resources/template/Model.java.vm +++ b/zlt-business/code-generator/src/main/resources/template/Model.java.vm @@ -1,13 +1,13 @@ package ${package}.${moduleName}.model; -import com.baomidou.mybatisplus.annotations.TableName; +import ${package}.common.model.SuperEntity; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Getter; import lombok.Setter; import lombok.EqualsAndHashCode; #if(${hasBigDecimal}) import java.math.BigDecimal; #end -import java.io.Serializable; import java.util.Date; /** diff --git a/zlt-business/code-generator/src/main/resources/template/Service.java.vm b/zlt-business/code-generator/src/main/resources/template/Service.java.vm index da0636d..40d7011 100644 --- a/zlt-business/code-generator/src/main/resources/template/Service.java.vm +++ b/zlt-business/code-generator/src/main/resources/template/Service.java.vm @@ -1,9 +1,8 @@ package ${package}.${moduleName}.service; -import ${package}.${moduleName}.entity.${className}; +import ${package}.${moduleName}.model.${className}; import com.central.common.model.PageResult; -import com.central.common.model.Result; -import com.baomidou.mybatisplus.extension.service.IService; +import ${package}.common.service.ISuperService; import java.util.Map; @@ -13,7 +12,7 @@ import java.util.Map; * @author ${author} * @date ${datetime} */ -public interface I${className}Service extends IService<${className}> { +public interface I${className}Service extends ISuperService<${className}> { /** * 列表 * @param params diff --git a/zlt-business/code-generator/src/main/resources/template/ServiceImpl.java.vm b/zlt-business/code-generator/src/main/resources/template/ServiceImpl.java.vm index 8c9a285..58bf2f6 100644 --- a/zlt-business/code-generator/src/main/resources/template/ServiceImpl.java.vm +++ b/zlt-business/code-generator/src/main/resources/template/ServiceImpl.java.vm @@ -1,19 +1,18 @@ package ${package}.${moduleName}.service.impl; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.central.common.model.PageResult; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import ${package}.common.service.impl.SuperServiceImpl; import java.util.List; import java.util.Map; import org.apache.commons.collections4.MapUtils; import lombok.extern.slf4j.Slf4j; -import ${package}.${moduleName}.entity.${className}; -import ${package}.${moduleName}.dao.${className}Dao; -import ${package}.${moduleName}.service.${className}Service; +import ${package}.${moduleName}.model.${className}; +import ${package}.${moduleName}.mapper.${className}Mapper; +import ${package}.${moduleName}.service.I${className}Service; /** * ${comments} @@ -23,22 +22,15 @@ import ${package}.${moduleName}.service.${className}Service; */ @Slf4j @Service -public class ${className}ServiceImpl extends ServiceImpl<${className}Mapper, ${className}> implements I${className}Service { +public class ${className}ServiceImpl extends SuperServiceImpl<${className}Mapper, ${className}> implements I${className}Service { /** * 列表 * @param params * @return */ + @Override public PageResult<${className}> findList(Map params){ - Integer curPage = MapUtils.getInteger(params, "page"); - Integer limit = MapUtils.getInteger(params, "limit"); - if (curPage == null) { - curPage = 1; - } - if (limit == null) { - limit = -1; - } - Page<${className}> page = new Page<>(curPage, limit); + Page<${className}> page = new Page<>(MapUtils.getInteger(params, "page"), MapUtils.getInteger(params, "limit")); List<${className}> list = baseMapper.findList(page, params); return PageResult.<${className}>builder().data(list).code(0).count(page.getTotal()).build(); } -- GitLab