From d8e7ad6acb9f6105ac6ff6fe2ce892e622cde256 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 18 三月 2025 22:11:24 +0800
Subject: [PATCH] Merge remote-tracking branch '喜望/dev-2.0' into dev-2.0
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/IdentityInformationServiceImpl.java | 110 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 74 insertions(+), 36 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/IdentityInformationServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/IdentityInformationServiceImpl.java
index 90e7d05..7d0c257 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/IdentityInformationServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/IdentityInformationServiceImpl.java
@@ -1,6 +1,8 @@
package com.panzhihua.sangeshenbian.service.impl;
+import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.redis.RedisUtils;
import com.panzhihua.sangeshenbian.model.entity.PartyMember;
@@ -8,7 +10,7 @@
import com.panzhihua.sangeshenbian.service.IPartyMemberService;
import com.panzhihua.sangeshenbian.service.ISystemUserService;
import com.panzhihua.sangeshenbian.service.IdentityInformationService;
-import com.panzhihua.sangeshenbian.warpper.IdentityInformationVO;
+import com.panzhihua.sangeshenbian.warpper.IdentityInformation;
import com.panzhihua.sangeshenbian.warpper.PermissionsVO;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@@ -22,63 +24,64 @@
private final ISystemUserService systemUserService;
private final IPartyMemberService partyMemberService;
private final RedisUtils redisUtils;
+
@Override
- public IdentityInformationVO getIdentityInformationVO(LoginUserInfoVO loginUserInfo) {
+ public IdentityInformation getIdentityInformation(LoginUserInfoVO loginUserInfo) {
// 获取党员信息
PartyMember partyMember = partyMemberService.getOne(new LambdaQueryWrapper<PartyMember>()
.eq(PartyMember::getPhone, loginUserInfo.getPhone())
.eq(PartyMember::getDelFlag, 0));
// 获取管理员信息
- SystemUser systemUser = systemUserService.getSystemUserAdminByPhone(loginUserInfo.getPhone()).orElse(null);
+ SystemUser systemUser = systemUserService.lambdaQuery()
+ .eq(SystemUser::getPhone, loginUserInfo.getPhone())
+ .eq(SystemUser::getIsAdmin, 1).last("LIMIT 1")
+ .one();
// 获取身份
Integer identity = (Integer) redisUtils.get("identity:" + loginUserInfo.getPhone());
+ // 权限列表
List<PermissionsVO> permissions = new ArrayList<>();
- IdentityInformationVO identityInformationVO = new IdentityInformationVO();
+
+ IdentityInformation identityInformationVO = new IdentityInformation();
+ identityInformationVO.setPartyMember(partyMember);
+ identityInformationVO.setSystemUser(systemUser);
// 获取提示内容是否确认
Integer isConfirm = (Integer) redisUtils.get("confirmContent:" + loginUserInfo.getPhone());
- identityInformationVO.setIsConfirmContent(isConfirm !=null && isConfirm == 1);
+ identityInformationVO.setIsConfirmContent(isConfirm != null && isConfirm == 1);
- if (partyMember != null) {
- identityInformationVO.setIsFrozen(partyMember.getFreezeStatus() == 1);
- }
- if (systemUser != null) {
- identityInformationVO.setIsFrozen(systemUser.getStatus() == 2);
- }
+ // 获取当前身份
if (identity == null && systemUser != null) {
identityInformationVO.setIdentity(2);
redisUtils.set("identity:" + loginUserInfo.getPhone(), 2);
- }else if (identity == null && partyMember != null){
+ } else if (identity == null && partyMember != null) {
identityInformationVO.setIdentity(1);
redisUtils.set("identity:" + loginUserInfo.getPhone(), 1);
- }
- else {
+ } else {
identityInformationVO.setIdentity(identity);
}
- if (identityInformationVO.getIdentity() != null){
- if (identityInformationVO.getIdentity() == 1){
- identityInformationVO.setIsFrozen(partyMember !=null && partyMember.getFreezeStatus() == 1);
- }else if (identityInformationVO.getIdentity() == 2){
- identityInformationVO.setIsFrozen(systemUser != null &&systemUser.getStatus() == 2);
+
+ // 获取是否冻结
+ if (identityInformationVO.getIdentity() != null) {
+ if (identityInformationVO.getIdentity() == 1) {
+ identityInformationVO.setIsFrozen(partyMember != null && partyMember.getFreezeStatus() == 1);
+ } else if (identityInformationVO.getIdentity() == 2) {
+ identityInformationVO.setIsFrozen(systemUser != null && systemUser.getStatus() == 2);
}
- }else {
+ } else {
identityInformationVO.setIsFrozen(false);
}
-
+ // 是否认证党员
identityInformationVO.setIsPartymember(partyMember != null && partyMember.getAuditStatus().equals(1));
+ // 是否确认党员信息
identityInformationVO.setIsConfirm(partyMember != null && partyMember.getIsConfirm() == 1);
+ // 党员审核状态
identityInformationVO.setAuditStatus(partyMember == null ? null : partyMember.getAuditStatus());
- if (partyMember != null) {
- PermissionsVO partyMemberPermissions = new PermissionsVO();
- partyMemberPermissions.setIdentity(1);
- partyMemberPermissions.setName(String.format("%s%s", partyMember.getCommunity(), "党员"));
- partyMemberPermissions.setIsFrozen(partyMember.getFreezeStatus() == 1);
- permissions.add(partyMemberPermissions);
- }
+
+ // 封装管理员信息
if (systemUser != null) {
Integer accountLevel = systemUser.getAccountLevel();
String districts = systemUser.getDistricts();
@@ -87,20 +90,55 @@
PermissionsVO adminPermissions = new PermissionsVO();
adminPermissions.setIdentity(2);
adminPermissions.setIsFrozen(systemUser.getStatus() == 2);
- if (accountLevel == 1){
- adminPermissions.setName(String.format("%s%s%s%s%s", "攀枝花市",districts, street, community, "管理员"));
- }if (accountLevel == 2) {
- adminPermissions.setName(String.format("%s%s%s%s", districts, street, community, "管理员"));
+ if (accountLevel == 1) {
+ adminPermissions.setName(String.format("%s%s", "攀枝花市", "管理员"));
+ } else if (accountLevel == 2) {
+ adminPermissions.setName(String.format("%s%s", districts, "管理员"));
} else if (accountLevel == 3) {
- adminPermissions.setIdentity(2);
- adminPermissions.setName(String.format("%s%s%s", street, community, "管理员"));
+ adminPermissions.setName(String.format("%s%s%s", districts, street, "管理员"));
} else if (accountLevel == 4) {
- adminPermissions.setName(String.format("%s%s", community, "管理员"));
- adminPermissions.setIdentity(2);
+ adminPermissions.setName(String.format("%s%s%s%s", districts, street, community, "管理员"));
+ } else {
+ adminPermissions.setName("未知");
}
permissions.add(adminPermissions);
}
+
+ // 封装党员信息
+ if (partyMember != null) {
+ PermissionsVO partyMemberPermissions = new PermissionsVO();
+ partyMemberPermissions.setIdentity(1);
+ partyMemberPermissions.setName(String.format("%s%s", partyMember.getCommunity(), "党员"));
+ partyMemberPermissions.setIsFrozen(partyMember.getFreezeStatus() == 1);
+ permissions.add(partyMemberPermissions);
+ }
identityInformationVO.setPermissions(permissions);
return identityInformationVO;
}
+
+
+
+ @Override
+ public IdentityInformation getCurrentIdentityInformation(LoginUserInfoVO loginUserInfo) {
+ IdentityInformation identityInformation = getIdentityInformation(loginUserInfo);
+ Boolean isFrozen = identityInformation.getIsFrozen();
+ if (isFrozen) {
+ throw new ServiceException("您的账号已被冻结，请联系管理员");
+ }
+ List<PermissionsVO> permissions = identityInformation.getPermissions();
+ if (CollectionUtil.isEmpty(permissions)){
+ throw new ServiceException("请先完成认证");
+ }
+
+ SystemUser systemUser = identityInformation.getSystemUser();
+ if (systemUser == null && identityInformation.getIdentity() == 2) {
+ throw new ServiceException("管理员信息不存在");
+ }
+
+ PartyMember partyMember = identityInformation.getPartyMember();
+ if (partyMember == null && identityInformation.getIdentity() == 1) {
+ throw new ServiceException("党员信息不存在");
+ }
+ return identityInformation;
+ }
}
--
Gitblit v1.7.1