From 16621230736231a0983532371315510f1ba1b958 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 9 Jun 2022 10:36:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E8=BA=AB=E4=BB=BD=E8=AF=81?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=85=9A=E5=91=98=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feign/ResiPartyMemberOpenFeignClient.java | 3 +++ ...ResiPartyMemberOpenFeignClientFallback.java | 5 +++++ .../controller/IcPartyMemberController.java | 6 ++++++ .../service/IcPartyMemberService.java | 10 ++++++++++ .../service/impl/IcPartyMemberServiceImpl.java | 18 ++++++++++++++++++ .../epmet/dto/result/IcUserRoleResultDTO.java | 7 +++++++ .../service/impl/IcResiUserServiceImpl.java | 11 ++++++++++- 7 files changed, 59 insertions(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java index d88cd797b3..ba6e36ecb3 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java @@ -124,4 +124,7 @@ public interface ResiPartyMemberOpenFeignClient { */ @PostMapping("/resi/partymember/icPartyMember/icPartyMemberSync") Result icPartyMemberSync(@RequestBody IcPartyMemberDTO dto); + + @PostMapping("/resi/partymember/icPartyMember/getPartyMemberByIdCard") + Result getPartyMemberByIdCard(@RequestBody IcPartyMemberDTO dto); } diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java index 3a10c64914..f4545ee638 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java @@ -88,4 +88,9 @@ public class ResiPartyMemberOpenFeignClientFallback implements ResiPartyMemberOp public Result icPartyMemberSync(IcPartyMemberDTO dto) { return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "icPartyMemberSync", dto); } + + @Override + public Result getPartyMemberByIdCard(IcPartyMemberDTO dto) { + return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "getPartyMemberByIdCard", dto); + } } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java index 3390d45acc..a1fdca4c49 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java @@ -112,6 +112,12 @@ public class IcPartyMemberController implements ResultDataResolver { return new Result(); } + @PostMapping("getPartyMemberByIdCard") + public Result getPartyMemberByIdCard(@RequestBody IcPartyMemberDTO dto){ + IcPartyMemberDTO result = icPartyMemberService.getPartyMemberByIdCard(dto); + return new Result().ok(result); + } + @NoRepeatSubmit @PostMapping("export") public void export(@LoginUser TokenDto tokenDto, @RequestBody IcPartyMemberFromDTO formDTO, HttpServletResponse response) throws Exception { diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberService.java index 0d84d90723..20373c3ca5 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberService.java @@ -85,6 +85,16 @@ public interface IcPartyMemberService extends BaseService { */ void delete(String[] ids); + /** + * 根据身份证获取党员信息 + * + * @Param dto + * @Return {@link IcPartyMemberDTO} + * @Author zhaoqifeng + * @Date 2022/6/9 10:07 + */ + IcPartyMemberDTO getPartyMemberByIdCard(IcPartyMemberDTO dto); + /** * 党员信息同步 * diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java index 922c6ca35a..3045e59b24 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java @@ -333,6 +333,24 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(IcPartyMemberEntity::getCustomerId, dto.getCustomerId()); + wrapper.eq(IcPartyMemberEntity::getIdCard, dto.getIdCard()); + IcPartyMemberEntity partyMember = baseDao.selectOne(wrapper); + return ConvertUtils.sourceToTarget(partyMember, IcPartyMemberDTO.class); + } + /** * 党员信息同步 * diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcUserRoleResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcUserRoleResultDTO.java index cfcd9da6aa..2daa69618e 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcUserRoleResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcUserRoleResultDTO.java @@ -1,5 +1,6 @@ package com.epmet.dto.result; +import com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO; import lombok.Data; import java.io.Serializable; @@ -16,4 +17,10 @@ public class IcUserRoleResultDTO implements Serializable { * 是否是志愿者0否，1是 */ private String isVolunteer; + /** + * 是否是党员0否，1是 + */ + private String isPartyMember; + + private IcPartyMemberDTO partyMemberInfo; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index a5ecb108e3..748bcd6950 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -2238,6 +2238,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl baseInfoWrapper = new LambdaQueryWrapper<>(); baseInfoWrapper.eq(UserBaseInfoEntity::getCustomerId, formDTO.getCustomerId()); @@ -2257,7 +2258,15 @@ public class IcResiUserServiceImpl extends BaseServiceImpl memberInfoResult = resiPartyMemberOpenFeignClient.getPartyMemberByIdCard(memberFormDTO); + if (memberInfoResult.success() && null != memberInfoResult.getData()) { + result.setIsPartyMember(NumConstant.ONE_STR); + result.setPartyMemberInfo(memberInfoResult.getData()); + } return result; }