From 0fc9760cf60f30e070c9e1ddb39dff0fe0fb5f91 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 17 三月 2025 22:24:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-2.0' into dev-2.0
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/HomeController.java | 70 ++++++++++++++++++++++++++++++----
1 files changed, 61 insertions(+), 9 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 3d856d3..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,29 +125,69 @@
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();
- if (partyMember != null){
+ identityInformationVO.setIsConfirmContent(isConfirm !=null && isConfirm == 1);
+ if (partyMember != null) {
identityInformationVO.setIsFrozen(partyMember.getFreezeStatus() == 1);
}
- if (systemUser != null){
+ if (systemUser != null) {
identityInformationVO.setIsFrozen(systemUser.getStatus() == 2);
}
- if (identity == null && systemUser != null){
+ if (identity == null && systemUser != null) {
identityInformationVO.setIdentity(2);
- }else {
+ 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){
- permissions.add(1);
+ 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){
- permissions.add(2);
+ 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);
@@ -163,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