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,8 +125,11 @@ 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.setIsConfirmContent(isConfirm == 1); if (partyMember != null){ identityInformationVO.setIsFrozen(partyMember.getFreezeStatus() == 1); } @@ -135,6 +139,7 @@ if (identity == null && systemUser != null){ identityInformationVO.setIdentity(2); redisUtils.set("identity:" + loginUserInfo.getPhone(), 2); }else { identityInformationVO.setIdentity(identity); } @@ -143,10 +148,30 @@ identityInformationVO.setIsConfirm(partyMember != null && partyMember.getIsConfirm() == 1); identityInformationVO.setAuditStatus(partyMember == null ? null : partyMember.getAuditStatus()); if (partyMember !=null){ permissions.add(1); 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); 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 +188,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(); } } springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/controller/PartyMemberController.java
@@ -50,9 +50,14 @@ @ApiOperation(value = "编辑党员信息") @PostMapping("/edit") public R<?> edit(@Valid @RequestBody PartyMemberApplicationRequest dto) { if (Objects.isNull(dto.getId())){ return R.fail("id不能为空"); LoginUserInfoVO loginUserInfo = getLoginUserInfo(); String phone = loginUserInfo.getPhone(); PartyMember partyMember = partyMemberService.getOne(new LambdaUpdateWrapper<PartyMember>() .eq(PartyMember::getPhone, phone)); if (partyMember == null){ return R.fail("请先完善党员信息"); } dto.setId(partyMember.getId()); partyMemberService.applyForMembership(dto, getLoginUserInfo()); return R.ok(); } @@ -76,7 +81,7 @@ */ @ApiOperation(value = "党员待审核列表") @PostMapping("/pre-audit-list") public R<?> preAuditList(Page<PendingPartyMemberApplicationVO> page) { public R<Page<PendingPartyMemberApplicationVO>> preAuditList(Page<PendingPartyMemberApplicationVO> page) { return R.ok(partyMemberService.preAuditList(page,getLoginUserInfo())); }
@@ -5,6 +5,7 @@ import lombok.Data; import java.util.List; import java.util.Map; @Data @ApiModel("身份信息对象") @@ -20,6 +21,12 @@ */ @ApiModelProperty(value = "是否冻结") private Boolean isFrozen; /** * 是否确认提示内容 */ @ApiModelProperty(value = "是否确认提示内容") private Boolean isConfirmContent; /** * 是否确认党员信息 @@ -43,5 +50,5 @@ * 权限列表 */ @ApiModelProperty(value = "权限列表:1-党员 2-管理员") private List<Integer> permissions; private List<PermissionsVO> permissions; } springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/warpper/PendingPartyMemberApplicationVO.java
@@ -1,5 +1,7 @@ package com.panzhihua.sangeshenbian.warpper; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -10,7 +12,8 @@ @Data @ApiModel("待审核党员申请传输对象") public class PendingPartyMemberApplicationVO { @ApiModelProperty(value = "主键id", notes = "编辑时必填") @ApiModelProperty(value = "主键id") @JsonSerialize(using = ToStringSerializer.class) private Long id; @ApiModelProperty(value = "审核状态 0：待审核 1：审核通过 2：审核不通过") springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/warpper/PermissionsVO.java
New file @@ -0,0 +1,16 @@ package com.panzhihua.sangeshenbian.warpper; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data @ApiModel("身份信息对象") public class PermissionsVO { @ApiModelProperty(value = "身份标识") private Integer identity; @ApiModelProperty(value = "身份名称") private String name; @ApiModelProperty(value = "是否冻结") private Boolean isFrozen; }
