From bdc56ebc9534620766d787a1dacb4c962ea10797 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Tue, 16 Jun 2020 10:36:35 +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/SysDoctorController.java | 60 +++++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 43 insertions(+), 17 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDoctorController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDoctorController.java
index 0a589ab..c3c62d7 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDoctorController.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDoctorController.java
@@ -1,29 +1,30 @@
package com.kidgrow.usercenter.controller;
-import java.util.Map;
+import com.kidgrow.common.annotation.LoginUser;
import com.kidgrow.common.controller.BaseController;
-import com.kidgrow.usercenter.vo.SysDoctorVo;
+import com.kidgrow.common.model.PageResult;
+import com.kidgrow.common.model.ResultBody;
+import com.kidgrow.common.model.SysUser;
+import com.kidgrow.usercenter.model.SysDoctor;
+import com.kidgrow.usercenter.service.ISysDoctorService;
import com.kidgrow.usercenter.vo.SysDoctorDto;
-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 com.kidgrow.usercenter.vo.SysDoctorVo;
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.SysDoctor;
-import com.kidgrow.usercenter.service.ISysDoctorService;
-import com.kidgrow.common.model.*;
-
+import org.apache.commons.collections4.MapUtils;
+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.servlet.http.HttpServletRequest;
import javax.validation.Valid;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
/**
@@ -37,7 +38,7 @@
@Slf4j
@RestController
@RequestMapping("/sysdoctor")
-@Api(tags = "")
+@Api(tags = "医生表")
public class SysDoctorController extends BaseController{
@Autowired
private ISysDoctorService sysDoctorService;
@@ -51,12 +52,13 @@
@ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer")
})
@GetMapping
- public PageResult<SysDoctorVo> list(@RequestParam Map<String, Object> params) {
+ public PageResult<SysDoctorVo> list(@RequestParam Map<String, Object> params,@LoginUser SysUser user) {
if(params.size()==0){
params.put("page",1);
params.put("limit",10);
}
- return sysDoctorService.findList(params);
+
+ return sysDoctorService.findList(params,user);
}
/**
@@ -68,7 +70,23 @@
SysDoctor model = sysDoctorService.getById(id);
return ResultBody.ok().data(model).msg("查询成功");
}
-
+ /**
+ * 判断用户名是否管理员
+ */
+ @ApiOperation(value = "判断用户名是否管理员")
+ @GetMapping("/userName")
+ public ResultBody findById(@RequestParam String userName) {
+ return sysDoctorService.userIsAdmin(userName);
+ }
+ /**
+ * 根据 Map 查询
+ */
+ @ApiOperation(value = "查询")
+ @PostMapping("/findByMap")
+ public ResultBody findByMap(@RequestBody Map<String,Object> map) {
+ List<SysDoctor> models = sysDoctorService.findByMap(map);
+ return ResultBody.ok().data(models).msg("查询成功");
+ }
/**
* 根据SysDoctor当做查询条件进行查询
*/
@@ -84,7 +102,7 @@
*/
@ApiOperation(value = "保存")
@PostMapping
- public ResultBody save(@Valid @RequestBody SysDoctorDto sysDoctor, BindingResult bindingResult, HttpServletRequest request) {
+ public ResultBody save(@Valid @RequestBody SysDoctorDto sysDoctor, BindingResult bindingResult, HttpServletRequest request,@LoginUser SysUser user) {
List<String> errMsg= new ArrayList<>();
if (bindingResult.hasErrors()) {
for (ObjectError error : bindingResult.getAllErrors()) {
@@ -92,7 +110,7 @@
}
return ResultBody.failed().msg(errMsg.toString());
} else {
- boolean v= sysDoctorService.saveOrUpdateSer(sysDoctor,request);
+ boolean v= sysDoctorService.saveOrUpdateSer(sysDoctor,request,user);
if(v) {
return ResultBody.ok().data(sysDoctor).msg("保存成功");
@@ -129,5 +147,13 @@
}
return sysDoctorService.enable(params);
}
+ /**
+ * 设为管理
+ */
+ @ApiOperation(value = "修改状态")
+ @PostMapping("setadmin")
+ public ResultBody setAdmin(@RequestBody Map<String, Object> params) {
+ return sysDoctorService.setAdminDoctor(params);
+ }
}
--
Gitblit v1.8.0