From 99f67e978ed5d73ef50172bafa8ed4d9e08c4099 Mon Sep 17 00:00:00 2001
From: 侯瑞军 <411269194@kidgrow.com>
Date: Fri, 05 Jun 2020 10:37:07 +0800
Subject: [PATCH] 1.新增和修改接口： （1）用户登录后返回信息接口 （2）用户注册 （3）诊断模版 （4）重置密码 修改密码 （5）设为超管 2.增加生成指定长度随机数common
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDoctorController.java | 71 ++++++++++++++++++++++++++---------
1 files changed, 52 insertions(+), 19 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 51be1e4..d694ad8 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,28 +1,30 @@
package com.kidgrow.usercenter.controller;
-import java.util.Map;
+import com.kidgrow.common.annotation.LoginUser;
import com.kidgrow.common.controller.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.ObjectError;
-import org.springframework.web.bind.annotation.*;
+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 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 javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import java.util.Set;
/**
@@ -36,7 +38,7 @@
@Slf4j
@RestController
@RequestMapping("/sysdoctor")
-@Api(tags = "")
+@Api(tags = "医生表")
public class SysDoctorController extends BaseController{
@Autowired
private ISysDoctorService sysDoctorService;
@@ -50,12 +52,13 @@
@ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer")
})
@GetMapping
- public ResultBody<PageResult> 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 ResultBody.ok().data(sysDoctorService.findList(params));
+
+ return sysDoctorService.findList(params,user);
}
/**
@@ -67,7 +70,15 @@
SysDoctor model = sysDoctorService.getById(id);
return ResultBody.ok().data(model).msg("查询成功");
}
-
+ /**
+ * 根据 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当做查询条件进行查询
*/
@@ -83,7 +94,7 @@
*/
@ApiOperation(value = "保存")
@PostMapping
- public ResultBody save(@Valid @RequestBody SysDoctor sysDoctor, BindingResult bindingResult) {
+ 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()) {
@@ -91,7 +102,8 @@
}
return ResultBody.failed().msg(errMsg.toString());
} else {
- boolean v= sysDoctorService.saveOrUpdate(sysDoctor);
+ boolean v= sysDoctorService.saveOrUpdateSer(sysDoctor,request,user);
+
if(v) {
return ResultBody.ok().data(sysDoctor).msg("保存成功");
}
@@ -107,7 +119,7 @@
@ApiOperation(value = "删除")
@DeleteMapping("/{id}")
public ResultBody delete(@PathVariable Long id) {
- boolean v= sysDoctorService.removeById(id);
+ boolean v= sysDoctorService.delete(id);
if(v) {
return ResultBody.ok().msg("删除成功");
}
@@ -115,4 +127,25 @@
return ResultBody.failed().msg("删除失败");
}
}
+ /**
+ * 状态
+ */
+ @ApiOperation(value = "修改状态")
+ @PostMapping("enable")
+ public ResultBody enable(@RequestBody Map<String, Object> params) {
+ Long id = MapUtils.getLong(params, "id");
+ if (id==null) {
+ return ResultBody.failed("请选择一条数据");
+ }
+ return sysDoctorService.enable(params);
+ }
+ /**
+ * 设为管理
+ */
+ @ApiOperation(value = "修改状态")
+ @PostMapping("setadmin")
+ public ResultBody setAdmin(@RequestBody Map<String, Object> params) {
+ return sysDoctorService.setAdminDoctor(params);
+ }
+
}
--
Gitblit v1.8.0