From 89ae2fa56764c8da0691253b3270f98e868c6726 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 14 Mar 2022 09:52:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E4=BB=BD=E7=94=9F=E6=88=90=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/template/Controller.java.vm | 21 +++-- .../resources/template/Controller.java.vm_bak | 77 ++++++++++++++++ .../template/ServiceImpl.java.vm.bak | 87 +++++++++++++++++++ 3 files changed, 174 insertions(+), 11 deletions(-) create mode 100644 epmet-cloud-generator/src/main/resources/template/Controller.java.vm_bak create mode 100644 epmet-cloud-generator/src/main/resources/template/ServiceImpl.java.vm.bak diff --git a/epmet-cloud-generator/src/main/resources/template/Controller.java.vm b/epmet-cloud-generator/src/main/resources/template/Controller.java.vm index e7d642a3ca..27b578fcfc 100644 --- a/epmet-cloud-generator/src/main/resources/template/Controller.java.vm +++ b/epmet-cloud-generator/src/main/resources/template/Controller.java.vm @@ -1,5 +1,6 @@ package ${package}.controller; +import ${main}.commons.tools.aop.NoRepeatSubmit; import ${main}.commons.tools.page.PageData; import ${main}.commons.tools.utils.ExcelUtils; import ${main}.commons.tools.utils.Result; @@ -28,22 +29,23 @@ import java.util.Map; @RestController @RequestMapping("${pathName}") public class ${className}Controller { - + @Autowired private ${className}Service ${classname}Service; - @GetMapping("page") + @RequestMapping("page") public Result> page(@RequestParam Map params){ PageData<${className}DTO> page = ${classname}Service.page(params); return new Result>().ok(page); } - @GetMapping("{id}") + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) public Result<${className}DTO> get(@PathVariable("id") String id){ ${className}DTO data = ${classname}Service.get(id); return new Result<${className}DTO>().ok(data); } + @NoRepeatSubmit @PostMapping public Result save(@RequestBody ${className}DTO dto){ //效验数据 @@ -52,7 +54,8 @@ public class ${className}Controller { return new Result(); } - @PutMapping + @NoRepeatSubmit + @PostMapping public Result update(@RequestBody ${className}DTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); @@ -60,7 +63,7 @@ public class ${className}Controller { return new Result(); } - @DeleteMapping + @PostMapping public Result delete(@RequestBody String[] ids){ //效验数据 AssertUtils.isArrayEmpty(ids, "id"); @@ -68,10 +71,6 @@ public class ${className}Controller { return new Result(); } - @GetMapping("export") - public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List<${className}DTO> list = ${classname}Service.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, ${className}Excel.class); - } -} \ No newline at end of file + +} diff --git a/epmet-cloud-generator/src/main/resources/template/Controller.java.vm_bak b/epmet-cloud-generator/src/main/resources/template/Controller.java.vm_bak new file mode 100644 index 0000000000..3bfa395628 --- /dev/null +++ b/epmet-cloud-generator/src/main/resources/template/Controller.java.vm_bak @@ -0,0 +1,77 @@ +package ${package}.controller; + +import ${main}.commons.tools.page.PageData; +import ${main}.commons.tools.utils.ExcelUtils; +import ${main}.commons.tools.utils.Result; +import ${main}.commons.tools.validator.AssertUtils; +import ${main}.commons.tools.validator.ValidatorUtils; +import ${main}.commons.tools.validator.group.AddGroup; +import ${main}.commons.tools.validator.group.UpdateGroup; +import ${main}.commons.tools.validator.group.DefaultGroup; +import ${package}.dto.${className}DTO; +import ${package}.excel.${className}Excel; +import ${package}.service.${className}Service; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * ${comments} + * + * @author ${author} ${email} + * @since ${version} ${date} + */ +@RestController +@RequestMapping("${pathName}") +public class ${className}Controller { + + @Autowired + private ${className}Service ${classname}Service; + + @GetMapping("page") + public Result> page(@RequestParam Map params){ + PageData<${className}DTO> page = ${classname}Service.page(params); + return new Result>().ok(page); + } + + @GetMapping("{id}") + public Result<${className}DTO> get(@PathVariable("id") String id){ + ${className}DTO data = ${classname}Service.get(id); + return new Result<${className}DTO>().ok(data); + } + + @PostMapping + public Result save(@RequestBody ${className}DTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + ${classname}Service.save(dto); + return new Result(); + } + + @PutMapping + public Result update(@RequestBody ${className}DTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + ${classname}Service.update(dto); + return new Result(); + } + + @DeleteMapping + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + ${classname}Service.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List<${className}DTO> list = ${classname}Service.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, ${className}Excel.class); + } + +} diff --git a/epmet-cloud-generator/src/main/resources/template/ServiceImpl.java.vm.bak b/epmet-cloud-generator/src/main/resources/template/ServiceImpl.java.vm.bak new file mode 100644 index 0000000000..f0bcfe2a7e --- /dev/null +++ b/epmet-cloud-generator/src/main/resources/template/ServiceImpl.java.vm.bak @@ -0,0 +1,87 @@ +package ${package}.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import ${main}.commons.mybatis.service.impl.BaseServiceImpl; +import ${main}.commons.tools.page.PageData; +import ${main}.commons.tools.utils.ConvertUtils; +import ${package}.commons.tools.constant.FieldConstant; +import ${package}.dao.${className}Dao; +import ${package}.dto.${className}DTO; +import ${package}.entity.${className}Entity; +import ${package}.redis.${className}Redis; +import ${package}.service.${className}Service; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * ${comments} + * + * @author ${author} ${email} + * @since ${version} ${date} + */ +@Service +public class ${className}ServiceImpl extends BaseServiceImpl<${className}Dao, ${className}Entity> implements ${className}Service { + + @Autowired + private ${className}Redis ${classname}Redis; + + @Override + public PageData<${className}DTO> page(Map params) { + IPage<${className}Entity> page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, ${className}DTO.class); + } + + @Override + public List<${className}DTO> list(Map params) { + List<${className}Entity> entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, ${className}DTO.class); + } + + private QueryWrapper<${className}Entity> getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper<${className}Entity> wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public ${className}DTO get(String id) { + ${className}Entity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, ${className}DTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(${className}DTO dto) { + ${className}Entity entity = ConvertUtils.sourceToTarget(dto, ${className}Entity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(${className}DTO dto) { + ${className}Entity entity = ConvertUtils.sourceToTarget(dto, ${className}Entity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} \ No newline at end of file