From 004e1229ed36a98cc3bb9e3c0eb15be2ab8c0642 Mon Sep 17 00:00:00 2001
From: 克 刘 <4345453@qq.com>
Date: Thu, 16 Apr 2020 11:16:49 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev

---
 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysHospitalController.java |  102 +++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 78 insertions(+), 24 deletions(-)

diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysHospitalController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysHospitalController.java
index 00e3687..ef629d9 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysHospitalController.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysHospitalController.java
@@ -1,45 +1,59 @@
 package com.kidgrow.usercenter.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.usercenter.model.SysHospital;
+import com.kidgrow.usercenter.service.ISysHospitalService;
+import com.kidgrow.usercenter.vo.HospitalListVo;
 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.usercenter.model.SysHospital;
-import com.kidgrow.usercenter.service.ISysHospitalService;
-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;
 
 
 /**
  * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
- * @Description: 
+ * @Description: 医院基础信息表
  * @Project: 用户中心
- * @CreateDate: Created in 2020-03-11 16:15:31 <br>
+ * @CreateDate: Created in 2020-04-02 18:32:36 <br>
  * @Author: <a href="4345453@kidgrow.com">liuke</a>
  * @version: 1.0
  */
 @Slf4j
 @RestController
 @RequestMapping("/syshospital")
-@Api(tags = "")
+@Api(tags = "医院基础信息表")
 public class SysHospitalController  extends BaseController{
     @Autowired
     private ISysHospitalService sysHospitalService;
 
+    /**
+     * 列表
+     */
+    @ApiOperation(value = "查询列表/单表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "page", value = "分页起始位置", required = true, dataType = "Integer"),
+            @ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer")
+    })
+    @GetMapping("/findOne")
+    public PageResult<SysHospital> listOne(@RequestParam Map<String, Object> params) {
+        if(params.size()==0){
+            params.put("page",1);
+            params.put("limit",10);
+        }
+        return sysHospitalService.findList(params);
+    }
     /**
      * 列表
      */
@@ -49,14 +63,18 @@
             @ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer")
     })
     @GetMapping
-    public PageResult list(@RequestParam Map<String, Object> params) {
+    public PageResult<HospitalListVo> list(@RequestParam Map<String, Object> params) {
         if(params.size()==0){
             params.put("page",1);
             params.put("limit",10);
         }
-        return sysHospitalService.findList(params);
+        return sysHospitalService.findHospitalList(params);
     }
-
+    @PostMapping("findAll")
+    @ApiOperation(value = "查询所有列表")
+    public ResultBody<SysHospital> findAll(@RequestBody Map<String, Object> params) {
+        return sysHospitalService.findAll(params);
+    }
     /**
      * 查询
      */
@@ -83,11 +101,20 @@
     @ApiOperation(value = "保存")
     @PostMapping
     public ResultBody save(@Valid @RequestBody SysHospital sysHospital, 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 {
-            sysHospitalService.saveOrUpdate(sysHospital);
-            return ResultBody.ok().data(sysHospital).msg("保存成功");
+            boolean v= sysHospitalService.saveOrUpdate(sysHospital);
+            if(v) {
+                return ResultBody.ok().data(sysHospital).msg("保存成功");
+            }
+            else {
+                return ResultBody.failed().msg("保存失败");
+            }
         }
     }
 
@@ -95,9 +122,36 @@
      * 删除
      */
     @ApiOperation(value = "删除")
-    @DeleteMapping("/{id}")
-    public ResultBody delete(@PathVariable Long id) {
-        sysHospitalService.removeById(id);
-        return ResultBody.ok().msg("删除成功");
+    @GetMapping("/delete")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Integer"),
+            @ApiImplicitParam(name = "departmentId", value = "departmentId", required = true, dataType = "Integer")
+    })
+    public ResultBody delete(@RequestParam Map<String, Object> params) {
+        if (params.size()==0)
+        {
+            return ResultBody.failed().msg("参数异常!");
+        }
+        return sysHospitalService.delete(params);
+    }
+    /**
+     * 修改状态
+     *
+     * @param params
+     * @return
+     */
+    @ApiOperation(value = "修改反馈数据状态")
+    @GetMapping("/updateEnabled")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Integer"),
+            @ApiImplicitParam(name = "departmentId", value = "departmentId", required = true, dataType = "Integer"),
+            @ApiImplicitParam(name = "enabled", value = "是否启用", required = true, dataType = "Boolean")
+    })
+    public ResultBody updateEnabled(@RequestParam Map<String, Object> params) {
+        if (params.size()==0)
+        {
+            return ResultBody.failed().msg("参数异常!");
+        }
+        return sysHospitalService.updateEnabled(params);
     }
 }

--
Gitblit v1.8.0