From cb9bc5daaa7ee5978c07d5107d3301473617f367 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Sat, 25 Jul 2020 17:14:42 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorServerController.java | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorServerController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorServerController.java
index 9bd1765..4c583d8 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorServerController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/DoctorServerController.java
@@ -1,27 +1,25 @@
package com.kidgrow.oprationcenter.controller;
-import java.util.Map;
+import com.alibaba.fastjson.JSON;
import com.kidgrow.common.controller.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import com.kidgrow.common.model.PageResult;
+import com.kidgrow.common.model.ResultBody;
+import com.kidgrow.oprationcenter.model.DoctorServer;
+import com.kidgrow.oprationcenter.service.IDoctorServerService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
-
-import com.kidgrow.oprationcenter.model.DoctorServer;
-import com.kidgrow.oprationcenter.service.IDoctorServerService;
-import com.kidgrow.common.model.*;
-
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.BindingResult;
+import org.springframework.validation.ObjectError;
+import org.springframework.web.bind.annotation.*;
+
import javax.validation.Valid;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import java.util.Set;
/**
@@ -83,9 +81,15 @@
@ApiOperation(value = "保存")
@PostMapping
public ResultBody save(@Valid @RequestBody DoctorServer doctorServer, BindingResult bindingResult) {
+ List<String> errMsg= new ArrayList<>();
if (bindingResult.hasErrors()) {
- return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage());
- } else {
+ for (ObjectError error : bindingResult.getAllErrors()) {
+ errMsg.add(error.getDefaultMessage());
+ }
+ ResultBody msg = ResultBody.failed().msg(errMsg.toString());
+ DoctorServer doctorServer1 = JSON.toJavaObject(JSON.parseObject(msg.getData().toString()), DoctorServer.class);
+ return ResultBody.failed().msg(errMsg.toString());
+ } else {
boolean v= doctorServerService.saveOrUpdate(doctorServer);
if(v) {
return ResultBody.ok().data(doctorServer).msg("保存成功");
--
Gitblit v1.8.0