From 04c359a40d51c391fdfea626e7f147422a33b89f Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Fri, 19 Jun 2020 09:43:08 +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 | 39 +++++++++++++++++++++++++++------------
1 files changed, 27 insertions(+), 12 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 b30291d..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,31 +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;
/**
@@ -70,6 +69,14 @@
public ResultBody findById(@PathVariable Long id) {
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 查询
@@ -140,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