From 73d5561cbf2bea50acc22f91050fcc3557d49de4 Mon Sep 17 00:00:00 2001 From: zhaoxiaohao <913652501@qq.com> Date: Mon, 17 Aug 2020 09:58:10 +0800 Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev --- kidgrow-business/kidgrow-code-generator/src/main/resources/template/Controller.java.vm | 25 ++++++++++++++++++++----- 1 files changed, 20 insertions(+), 5 deletions(-) diff --git a/kidgrow-business/kidgrow-code-generator/src/main/resources/template/Controller.java.vm b/kidgrow-business/kidgrow-code-generator/src/main/resources/template/Controller.java.vm index a0a5f7a..3491a40 100644 --- a/kidgrow-business/kidgrow-code-generator/src/main/resources/template/Controller.java.vm +++ b/kidgrow-business/kidgrow-code-generator/src/main/resources/template/Controller.java.vm @@ -15,6 +15,7 @@ import com.kidgrow.common.model.*; import org.springframework.validation.BindingResult; +import org.springframework.validation.ObjectError; import javax.validation.Valid; import javax.servlet.http.HttpServletResponse; import java.io.IOException; @@ -83,11 +84,20 @@ @ApiOperation(value = "保存") @PostMapping public ResultBody save(@Valid @RequestBody ${className} ${classname}, BindingResult bindingResult) { + List<String> errMsg= new ArrayList<>(); if (bindingResult.hasErrors()) { - return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage()); + for (ObjectError error : bindingResult.getAllErrors()) { + errMsg.add(error.getDefaultMessage()); + } + return ResultBody.failed().msg(errMsg.toString()); } else { - ${classname}Service.saveOrUpdate(${classname}); - return ResultBody.ok().data(${classname}).msg("保存成功"); + boolean v= ${classname}Service.saveOrUpdate(${classname}); + if(v) { + return ResultBody.ok().data(${classname}).msg("保存成功"); + } + else { + return ResultBody.failed().msg("保存失败"); + } } } @@ -97,7 +107,12 @@ @ApiOperation(value = "删除") @DeleteMapping("/{id}") public ResultBody delete(@PathVariable Long ${pk.attrname}) { - ${classname}Service.removeById(${pk.attrname}); - return ResultBody.ok().msg("删除成功"); + boolean v= ${classname}Service.removeById(${pk.attrname}); + if(v) { + return ResultBody.ok().msg("删除成功"); + } + else { + return ResultBody.failed().msg("删除失败"); + } } } -- Gitblit v1.8.0