上报部门bug修改

mitao

2025-03-18 4c9460fbe6e2f39dddb99e43b7506b34e99bffe9

 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;
@@ -41,6 +42,7 @@
    private final ISystemUserService systemUserService;
    private final IPartyMemberService partyMemberService;
    private final RedisUtils redisUtils;
    private final IdentityInformationService identityInformationService;

    @ApiOperation("获取banner列表")
    @GetMapping("/banner-list")
@@ -58,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());
@@ -115,42 +118,10 @@
    @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());
        List<Integer> permissions = new ArrayList<>();
        IdentityInformationVO identityInformationVO = new IdentityInformationVO();
        if (partyMember != null){
            identityInformationVO.setIsFrozen(partyMember.getFreezeStatus() == 1);
        }
        if (systemUser != null){
            identityInformationVO.setIsFrozen(systemUser.getStatus() == 2);
        }

        if (identity == null && systemUser != null){
            identityInformationVO.setIdentity(2);
        }else {
            identityInformationVO.setIdentity(identity);
        }

        identityInformationVO.setIsPartymember(partyMember != null);
        identityInformationVO.setIsConfirm(partyMember != null && partyMember.getIsConfirm() == 1);
        identityInformationVO.setAuditStatus(partyMember == null ? null : partyMember.getAuditStatus());
        if (partyMember !=null){
            permissions.add(1);
        }
        if (systemUser != null){
            permissions.add(2);
        }
        identityInformationVO.setPermissions(permissions);
        IdentityInformationVO identityInformationVO = identityInformationService.getIdentityInformationVO(loginUserInfo);
        return R.ok(identityInformationVO);
    }



    /**
@@ -163,4 +134,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();
    }
}