Gitlink
/
microservices
0
1
Fork 12
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(用户身份状态管理): 成员移出组织/项目，原指派给这个成员的工作项/其他该怎么显示 

1. 用户状态信息根据实施情况展示
2. 账号已注销状态

Signed-off-by: OTTO <731554297@qq.com>
This commit is contained in:
OTTO 2024-10-10 09:22:56 +08:00
parent c2b2d515f7
commit 4861d5015d
2 changed files with 42 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
microservices-common/microservices-common-core/src/main/java/com/microservices/common/core/enums/UserIdentityStatus.java
View File

@ -10,7 +10,8 @@ import lombok.Getter;
@Getter
public enum UserIdentityStatus {
NORMAL("normal", "正常"),
QUIT("quit", "已离职");
QUIT("quit", "已离职"),
DELETE("delete", "账号已注销");
private final String state;
private final String info;
@ -19,6 +20,21 @@ public enum UserIdentityStatus {
this.info = info;
}
/**
* 获取非正常状态
*
* @param state 状态值
* @return 状态
*/
public static UserIdentityStatus getNonNormalState(String state) {
for (UserIdentityStatus status : values()) {
if (status != NORMAL && status.state.equals(state)) {
return status;
}
}
return null;
}
public String getStateInfo() {
return "(" + this.getInfo() + ")";
}

48
microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/common/service/impl/PmsCommonServiceImpl.java
View File

@ -39,8 +39,7 @@ import java.util.stream.Collectors;
* @date 2023-10-10
*/
@Service
public class PmsCommonServiceImpl implements IPmsCommonService
{
public class PmsCommonServiceImpl implements IPmsCommonService {
private static final Logger logger = LoggerFactory.getLogger(PmsCommonServiceImpl.class);
@Autowired
private RemoteFileService remoteFileService;
@ -103,7 +102,7 @@ public class PmsCommonServiceImpl implements IPmsCommonService
@Override
public List<SysFileInfo> getAllFileByFileIds(String fileIds) {
if(StringUtils.isBlank(fileIds)){
if (StringUtils.isBlank(fileIds)) {
return new ArrayList<>();
}
List<SysFileInfo> sysFileInfoList;
@ -142,9 +141,9 @@ public class PmsCommonServiceImpl implements IPmsCommonService
}
@Override
public SimpleSysUser getSimpleSysUserByGitlinkUserId(Long gitlinkUserId){
SysUser sysUser=getSysUserByGitlinkId(gitlinkUserId);
if(sysUser==null){
public SimpleSysUser getSimpleSysUserByGitlinkUserId(Long gitlinkUserId) {
SysUser sysUser = getSysUserByGitlinkId(gitlinkUserId);
if (sysUser == null) {
return null;
}
return sysUser.toSimpleSysUser(gitLinkRequestHelper.gitLinkUrl);
@ -175,29 +174,29 @@ public class PmsCommonServiceImpl implements IPmsCommonService
return userList;
}
private SysUser getSysUserByGitlinkId(Long gitlinkUserId){
if(gitlinkUserId==null){
private SysUser getSysUserByGitlinkId(Long gitlinkUserId) {
if (gitlinkUserId == null) {
return null;
}
SysUser sysUser = FeignUtils.getReturnData(
remoteUserService.getSysUserByGitLinkUserId(gitlinkUserId, SecurityConstants.INNER)
);
if(sysUser==null){
throw new ServiceException("该用户不存在(用户Id[%d])",gitlinkUserId);
if (sysUser == null) {
throw new ServiceException("该用户不存在(用户Id[%d])", gitlinkUserId);
}
setSysUserIdentifyStatus(sysUser);
return sysUser;
}
private SysUser getSysUserByUsername(String username){
if(StringUtils.isEmpty(username)){
private SysUser getSysUserByUsername(String username) {
if (StringUtils.isEmpty(username)) {
return null;
}
SysUser sysUser = FeignUtils.getReturnData(
remoteUserService.getSysUserByUserName(username, SecurityConstants.INNER)
);
if(sysUser==null){
throw new ServiceException("该用户不存在(用户名[%d])",username);
if (sysUser == null) {
throw new ServiceException("该用户不存在(用户名[%d])", username);
}
setSysUserIdentifyStatus(sysUser);
return sysUser;
@ -207,15 +206,18 @@ public class PmsCommonServiceImpl implements IPmsCommonService
SysUserDeptRole userIdentity = FeignUtils.getReturnData(
remoteUserService.getAllStatusUserIdentityByDeptIdAndUserId(SecurityUtils.getDeptId(), sysUser.getUserId(), SecurityConstants.INNER)
);
if (userIdentity != null && UserIdentityStatus.QUIT.getState().equals(userIdentity.getState())) {
sysUser.setNickName(sysUser.getNickName() + UserIdentityStatus.QUIT.getStateInfo());
if (userIdentity != null) {
UserIdentityStatus abnormalState = UserIdentityStatus.getNonNormalState(userIdentity.getState());
if (abnormalState != null) {
sysUser.setNickName(sysUser.getNickName() + abnormalState.getStateInfo());
}
}
}
@Override
public SimpleSysUser getSimpleSysUserByUsername(String username){
SysUser sysUser=getSysUserByUsername(username);
if(sysUser==null){
public SimpleSysUser getSimpleSysUserByUsername(String username) {
SysUser sysUser = getSysUserByUsername(username);
if (sysUser == null) {
return null;
}
return sysUser.toSimpleSysUser(gitLinkRequestHelper.gitLinkUrl);
@ -223,8 +225,8 @@ public class PmsCommonServiceImpl implements IPmsCommonService
@Override
public SimpleGitlinkUser getSimpleGitlinkUserByGitlinkUserId(Long gitlinkUserId) {
SysUser sysUser=getSysUserByGitlinkId(gitlinkUserId);
if(sysUser==null){
SysUser sysUser = getSysUserByGitlinkId(gitlinkUserId);
if (sysUser == null) {
return null;
}
return sysUser.toSimpleGitlinkUser();
@ -232,8 +234,8 @@ public class PmsCommonServiceImpl implements IPmsCommonService
@Override
public SimpleGitlinkUser getSimpleGitlinkUserByUsername(String username) {
SysUser sysUser=getSysUserByUsername(username);
if(sysUser==null){
SysUser sysUser = getSysUserByUsername(username);
if (sysUser == null) {
return null;
}
return sysUser.toSimpleGitlinkUser();