diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/UserController.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/UserController.java index e8806b7..fef0f70 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/UserController.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/UserController.java @@ -3,6 +3,7 @@ package com.electromagnetic.industry.software.manage.controller; import com.electromagnetic.industry.software.common.enums.PublishEnum; import com.electromagnetic.industry.software.common.resp.ElectromagneticResult; import com.electromagnetic.industry.software.common.util.ElectromagneticResultUtil; +import com.electromagnetic.industry.software.common.util.UserThreadLocal; import com.electromagnetic.industry.software.manage.pojo.req.*; import com.electromagnetic.industry.software.manage.service.UserService; import io.swagger.annotations.ApiOperation; @@ -95,4 +96,14 @@ public class UserController { return ElectromagneticResultUtil.success(userService.resetPassword(userId)); } + @ApiOperation(value = "获取当前用户管理员类型") + @GetMapping(value = "/getAdminType") + public ElectromagneticResult getAdminType() { + String adminType = UserThreadLocal.getAdminType(); + if (adminType == null || adminType.isEmpty()) { + return ElectromagneticResultUtil.fail("500","当前用户未登录"); + } else { + return ElectromagneticResultUtil.success(adminType); + } + } } \ No newline at end of file diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/UserLoginResponse.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/UserLoginResponse.java index aab2dc7..8c6c06d 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/UserLoginResponse.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/UserLoginResponse.java @@ -11,5 +11,4 @@ public class UserLoginResponse implements Serializable { private String userId; - private String adminType; } diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserServiceImpl.java index 8b827cf..455cf4f 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserServiceImpl.java @@ -70,7 +70,6 @@ public class UserServiceImpl implements UserService { UserLoginResponse userLoginResponse = new UserLoginResponse(); userLoginResponse.setToken(tokenStr); userLoginResponse.setUserId(user.getUserId()); - userLoginResponse.setAdminType(user.getAdminType()); return ElectromagneticResultUtil.success(userLoginResponse); } return ElectromagneticResultUtil.fail("500", "用户不存在/密码错误");