From ef31d1678d820175f47c3645704ddecf171265ae Mon Sep 17 00:00:00 2001
From: dougang <78125310@kidgrow.com>
Date: Sat, 14 Nov 2020 15:16:08 +0800
Subject: [PATCH] 增加C端筛查医院和机构功能
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/HospitalScreeningController.java | 87 +++++++++++++++++++++++++++++++++----------
1 files changed, 67 insertions(+), 20 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/HospitalScreeningController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/HospitalScreeningController.java
index afcc45e..79aa3f8 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/HospitalScreeningController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/HospitalScreeningController.java
@@ -1,34 +1,31 @@
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.HospitalScreening;
+import com.kidgrow.oprationcenter.service.IHospitalScreeningService;
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.HospitalScreening;
-import com.kidgrow.oprationcenter.service.IHospitalScreeningService;
-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: 筛查医院信息表-未完待续
- * @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,7 +46,7 @@
@ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer")
})
@GetMapping
- public PageResult list(@RequestParam Map<String, Object> params) {
+ public PageResult<HospitalScreening> list(@RequestParam Map<String, Object> params) {
if(params.size()==0){
params.put("page",1);
params.put("limit",10);
@@ -83,11 +80,28 @@
@ApiOperation(value = "保存")
@PostMapping
public ResultBody save(@Valid @RequestBody HospitalScreening hospitalScreening, BindingResult bindingResult) {
+ List<String> errMsg= new ArrayList<>();
if (bindingResult.hasErrors()) {
- return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage());
- } else {
- hospitalScreeningService.saveOrUpdate(hospitalScreening);
- return ResultBody.ok().data(hospitalScreening).msg("保存成功");
+ for (ObjectError error : bindingResult.getAllErrors()) {
+ errMsg.add(error.getDefaultMessage());
+ }
+ return ResultBody.failed().msg(errMsg.toString());
+ } else {
+ if(hospitalScreening.getId() == null){
+ HospitalScreening hs = new HospitalScreening();
+ hs.setHospitalId(hospitalScreening.getHospitalId());
+ HospitalScreening byObject = hospitalScreeningService.findByObject(hs);
+ if(byObject != null){
+ return ResultBody.failed().msg("该医院已添加");
+ }
+ }
+ boolean v= hospitalScreeningService.saveOrUpdate(hospitalScreening);
+ if(v) {
+ return ResultBody.ok().data(hospitalScreening).msg("保存成功");
+ }
+ else {
+ return ResultBody.failed().msg("保存失败");
+ }
}
}
@@ -97,7 +111,40 @@
@ApiOperation(value = "删除")
@DeleteMapping("/{id}")
public ResultBody delete(@PathVariable Long id) {
- hospitalScreeningService.removeById(id);
- return ResultBody.ok().msg("删除成功");
+ boolean v= hospitalScreeningService.removeById(id);
+ if(v) {
+ return ResultBody.ok().msg("删除成功");
+ }
+ else {
+ return ResultBody.failed().msg("删除失败");
+ }
+ }
+
+ /**
+ * 修改状态
+ *
+ * @param params
+ * @return
+ */
+ @ApiOperation(value = "修改反馈数据状态")
+ @GetMapping("/updateEnabled")
+ public ResultBody updateEnabled(@RequestParam Map<String, Object> params) {
+ if (params.size() == 0) {
+ return ResultBody.failed().msg("参数异常！");
+ }
+ return hospitalScreeningService.updateEnabled(params);
+ }
+
+ /**
+ * 查询
+ */
+ @ApiOperation(value = "查询")
+ @GetMapping("/findByName")
+ public ResultBody findByName(@RequestParam String hospitalName) {
+ if (!hospitalName.isEmpty()) {
+ return ResultBody.ok().data(hospitalScreeningService.findByName(hospitalName).getData()).msg("查询成功");
+ } else {
+ return ResultBody.ok().data(null).msg("");
+ }
}
}
--
Gitblit v1.8.0