From 8254f017ec6f4090fa65de76dcaf1d31e5161a11 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 18 三月 2025 10:08:15 +0800
Subject: [PATCH] bug修改

---
 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/HomeController.java |   82 +++++++++++++++++++++++++++++++++++++----
 1 files changed, 74 insertions(+), 8 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 d92e42e..d60f3a5 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
@@ -18,6 +18,7 @@
 import com.panzhihua.sangeshenbian.service.*;
 import com.panzhihua.sangeshenbian.utils.BaiduMapUtil;
 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;
@@ -124,20 +125,74 @@
         SystemUser systemUser = systemUserService.getSystemUserAdminByPhone(getLoginUserInfo().getPhone()).orElse(null);
         // 获取身份
         Integer identity = (Integer) redisUtils.get("identity:" + loginUserInfo.getPhone());
-        List<Integer> permissions = new ArrayList<>();
+        // 获取提示内容是否确认
+        Integer isConfirm = (Integer) redisUtils.get("confirmContent:" + loginUserInfo.getPhone());
+        List<PermissionsVO> permissions = new ArrayList<>();
         IdentityInformationVO identityInformationVO = new IdentityInformationVO();
-        identityInformationVO.setIdentity(identity);
-        identityInformationVO.setIsPartymember(partyMember != null);
-        identityInformationVO.setAuditStatus(partyMember == null ? null : partyMember.getAuditStatus());
-        if (partyMember !=null){
-            permissions.add(1);
+        identityInformationVO.setIsConfirmContent(isConfirm !=null && isConfirm == 1);
+        if (partyMember != null) {
+            identityInformationVO.setIsFrozen(partyMember.getFreezeStatus() == 1);
         }
-        if (systemUser != null){
-            permissions.add(2);
+        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);
         return R.ok(identityInformationVO);
     }
+
 
     /**
      * 切换身份
@@ -149,4 +204,15 @@
         redisUtils.set("identity:" + loginUserInfo.getPhone(), identity);
         return R.ok();
     }
+
+    /**
+     * 提示内容确认
+     */
+    @GetMapping("/confirm-content")
+    @ApiOperation("提示内容确认")
+    public R<?> confirmContent() {
+        LoginUserInfoVO loginUserInfo = getLoginUserInfo();
+        redisUtils.set("confirmContent:" + loginUserInfo.getPhone(), 1);
+        return R.ok();
+    }
 }

--
Gitblit v1.7.1