From 729f3af10a01c2179d08d7f15b0015a0b86a6a08 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 18 三月 2025 15:39:29 +0800
Subject: [PATCH] bug修改
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/HomeController.java | 82 +++-------------------------------------
1 files changed, 7 insertions(+), 75 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/HomeController.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/HomeController.java
index d60f3a5..4b2ad0e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/HomeController.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/HomeController.java
@@ -8,7 +8,6 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.redis.RedisUtils;
import com.panzhihua.sangeshenbian.model.entity.Banner;
-import com.panzhihua.sangeshenbian.model.entity.Department;
import com.panzhihua.sangeshenbian.model.entity.PartyMember;
import com.panzhihua.sangeshenbian.model.entity.SystemUser;
import com.panzhihua.sangeshenbian.model.query.BasePage;
@@ -17,11 +16,12 @@
import com.panzhihua.sangeshenbian.model.vo.PartyCardInfoVO;
import com.panzhihua.sangeshenbian.service.*;
import com.panzhihua.sangeshenbian.utils.BaiduMapUtil;
+import com.panzhihua.sangeshenbian.warpper.IdentityInformation;
import com.panzhihua.sangeshenbian.warpper.IdentityInformationVO;
-import com.panzhihua.sangeshenbian.warpper.PermissionsVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
+import org.springframework.beans.BeanUtils;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*;
@@ -42,6 +42,7 @@
private final ISystemUserService systemUserService;
private final IPartyMemberService partyMemberService;
private final RedisUtils redisUtils;
+ private final IdentityInformationService identityInformationService;
@ApiOperation("获取banner列表")
@GetMapping("/banner-list")
@@ -59,6 +60,7 @@
.eq(PartyMember::getDelFlag, 0));
PartyCardInfoVO partyCardInfoVO = new PartyCardInfoVO();
+ partyCardInfoVO.setAvatar(partyMember.getAvatar());
partyCardInfoVO.setName(partyMember.getName());
partyCardInfoVO.setIdCard(partyMember.getIdNumber());
partyCardInfoVO.setDistricts(partyMember.getDistricts());
@@ -116,84 +118,14 @@
@ApiOperation("获取身份信息")
public R<IdentityInformationVO> getIdentityInfo() {
LoginUserInfoVO loginUserInfo = getLoginUserInfo();
- // 获取党员信息
- PartyMember partyMember = partyMemberService.getOne(new LambdaQueryWrapper<PartyMember>()
- .eq(PartyMember::getPhone, loginUserInfo.getPhone())
- .eq(PartyMember::getDelFlag, 0));
-
- // 获取管理员信息
- SystemUser systemUser = systemUserService.getSystemUserAdminByPhone(getLoginUserInfo().getPhone()).orElse(null);
- // 获取身份
- Integer identity = (Integer) redisUtils.get("identity:" + loginUserInfo.getPhone());
- // 获取提示内容是否确认
- Integer isConfirm = (Integer) redisUtils.get("confirmContent:" + loginUserInfo.getPhone());
- List<PermissionsVO> permissions = new ArrayList<>();
+ IdentityInformation identityInformation = identityInformationService.getIdentityInformation(loginUserInfo);
IdentityInformationVO identityInformationVO = new IdentityInformationVO();
- 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){
- identityInformationVO.setIdentity(1);
- redisUtils.set("identity:" + loginUserInfo.getPhone(), 1);
- }
- 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);
- }
- }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();
- String street = systemUser.getStreet();
- String community = systemUser.getCommunity();
- 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.setIdentity(2);
- } else if (accountLevel == 3) {
- adminPermissions.setIdentity(2);
- } else if (accountLevel == 4) {
- adminPermissions.setIdentity(2);
- }
- permissions.add(adminPermissions);
- }
- identityInformationVO.setPermissions(permissions);
+ BeanUtils.copyProperties(identityInformation, identityInformationVO);
return R.ok(identityInformationVO);
}
+
/**
* 切换身份
*/
--
Gitblit v1.7.1