重写获取管理员身份接口
This commit is contained in:
parent
b15d2dec57
commit
bb2df18f6d
|
|
@ -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.enums.PublishEnum;
|
||||||
import com.electromagnetic.industry.software.common.resp.ElectromagneticResult;
|
import com.electromagnetic.industry.software.common.resp.ElectromagneticResult;
|
||||||
import com.electromagnetic.industry.software.common.util.ElectromagneticResultUtil;
|
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.pojo.req.*;
|
||||||
import com.electromagnetic.industry.software.manage.service.UserService;
|
import com.electromagnetic.industry.software.manage.service.UserService;
|
||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
|
|
@ -95,4 +96,14 @@ public class UserController {
|
||||||
return ElectromagneticResultUtil.success(userService.resetPassword(userId));
|
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);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -11,5 +11,4 @@ public class UserLoginResponse implements Serializable {
|
||||||
|
|
||||||
private String userId;
|
private String userId;
|
||||||
|
|
||||||
private String adminType;
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -70,7 +70,6 @@ public class UserServiceImpl implements UserService {
|
||||||
UserLoginResponse userLoginResponse = new UserLoginResponse();
|
UserLoginResponse userLoginResponse = new UserLoginResponse();
|
||||||
userLoginResponse.setToken(tokenStr);
|
userLoginResponse.setToken(tokenStr);
|
||||||
userLoginResponse.setUserId(user.getUserId());
|
userLoginResponse.setUserId(user.getUserId());
|
||||||
userLoginResponse.setAdminType(user.getAdminType());
|
|
||||||
return ElectromagneticResultUtil.success(userLoginResponse);
|
return ElectromagneticResultUtil.success(userLoginResponse);
|
||||||
}
|
}
|
||||||
return ElectromagneticResultUtil.fail("500", "用户不存在/密码错误");
|
return ElectromagneticResultUtil.fail("500", "用户不存在/密码错误");
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue