From d3386ce4a4439ee740ca79d33ac7040963a18948 Mon Sep 17 00:00:00 2001 From: zhaoxiaohao <913652501@qq.com> Date: Fri, 24 Apr 2020 11:31:26 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorTempleteController.java | 42 +++++++++++++++++++++++++++++++++--------- 1 files changed, 33 insertions(+), 9 deletions(-) diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorTempleteController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorTempleteController.java index 9eddb20..b5b0601 100644 --- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorTempleteController.java +++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorTempleteController.java @@ -2,7 +2,9 @@ import java.util.Map; import com.kidgrow.common.controller.BaseController; +import org.apache.commons.collections4.MapUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.ObjectError; import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -27,8 +29,8 @@ /** * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br> * @Description: 医生的模板 - * @Project: 用户中心 - * @CreateDate: Created in 2020-04-01 09:37:05 <br> + * @Project: 运营中心 + * @CreateDate: Created in 2020-04-02 18:25:34 <br> * @Author: <a href="4345453@kidgrow.com">liuke</a> * @version: 1.0 */ @@ -83,21 +85,43 @@ @ApiOperation(value = "保存") @PostMapping public ResultBody save(@Valid @RequestBody DoctorTemplete doctorTemplete, BindingResult bindingResult) { + List<String> errMsg= new ArrayList<>(); if (bindingResult.hasErrors()) { - return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage()); - } else { - doctorTempleteService.saveOrUpdate(doctorTemplete); - return ResultBody.ok().data(doctorTemplete).msg("保存成功"); + for (ObjectError error : bindingResult.getAllErrors()) { + errMsg.add(error.getDefaultMessage()); + } + return ResultBody.failed().msg(errMsg.toString()); + } else { + boolean v= doctorTempleteService.saveOrUpdate(doctorTemplete); + if(v) { + return ResultBody.ok().data(doctorTemplete).msg("保存成功"); + } + else { + return ResultBody.failed().msg("保存失败"); + } } } - + //updateEnabled + @GetMapping("/updateEnabled") + @ApiImplicitParams({ + @ApiImplicitParam(name = "id", value = "用户id", required = true, dataType = "Integer"), + @ApiImplicitParam(name = "enabled", value = "是否启用", required = true, dataType = "Boolean") + }) + public ResultBody updateEnabled(@RequestParam Map<String, Object> params) { + return doctorTempleteService.updateEnabled(params); + } /** * 删除 */ @ApiOperation(value = "删除") @DeleteMapping("/{id}") public ResultBody delete(@PathVariable Long id) { - doctorTempleteService.removeById(id); - return ResultBody.ok().msg("删除成功"); + boolean v= doctorTempleteService.removeById(id); + if(v) { + return ResultBody.ok().msg("删除成功"); + } + else { + return ResultBody.failed().msg("删除失败"); + } } } -- Gitblit v1.8.0