From 824b1a4d9cc70a8421fde067541ce64369c517d4 Mon Sep 17 00:00:00 2001
From: 侯瑞军 <411269194@kidgrow.com>
Date: Fri, 03 Apr 2020 14:21:18 +0800
Subject: [PATCH] 1.为所有的controller中的save方法增加服务端验证代码 2.将所有的model中的实体种的  NotBlank非空验证改为 NotEmpty,并格式化代码 3.删除了user_center中test中的hospitalMapper.java测试文件(因控制器和model的修改有错误。) 4.将opration-server中的config目录移动到正确位置。

---
 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/BusinessRecordsController.java |   46 +++++++++++++++++++++++++---------------------
 1 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/BusinessRecordsController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/BusinessRecordsController.java
index 44f6f69..d8d407e 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/BusinessRecordsController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/BusinessRecordsController.java
@@ -1,34 +1,28 @@
 package com.kidgrow.oprationcenter.controller;
 
-import java.util.Map;
 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.BusinessRecords;
+import com.kidgrow.oprationcenter.service.IBusinessRecordsService;
 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.BusinessRecords;
-import com.kidgrow.oprationcenter.service.IBusinessRecordsService;
-import com.kidgrow.common.model.*;
-
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
+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;
 
 
 /**
  * 石家庄喜高科技有限责任公司 版权所有 © 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
  */
@@ -49,12 +43,12 @@
             @ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer")
     })
     @GetMapping
-    public PageResult list(@RequestParam Map<String, Object> params) {
+    public ResultBody<PageResult> list(@RequestParam Map<String, Object> params) {
         if(params.size()==0){
             params.put("page",1);
             params.put("limit",10);
         }
-        return businessRecordsService.findList(params);
+        return ResultBody.ok().data(businessRecordsService.findList(params));
     }
 
     /**
@@ -86,8 +80,13 @@
         if (bindingResult.hasErrors()) {
             return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage());
         } else {
-            businessRecordsService.saveOrUpdate(businessRecords);
-            return ResultBody.ok().data(businessRecords).msg("保存成功");
+            boolean v= businessRecordsService.saveOrUpdate(businessRecords);
+            if(v) {
+                return ResultBody.ok().data(businessRecords).msg("保存成功");
+            }
+            else {
+                return ResultBody.failed().msg("保存失败");
+            }
         }
     }
 
@@ -97,7 +96,12 @@
     @ApiOperation(value = "删除")
     @DeleteMapping("/{id}")
     public ResultBody delete(@PathVariable Long id) {
-        businessRecordsService.removeById(id);
-        return ResultBody.ok().msg("删除成功");
+        boolean v= businessRecordsService.removeById(id);
+        if(v) {
+            return ResultBody.ok().msg("删除成功");
+        }
+        else {
+            return ResultBody.failed().msg("删除失败");
+        }
     }
 }

--
Gitblit v1.8.0