From 546957c8a76ce69f56bcc3fca0eb40b4378f489a Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 20 May 2022 10:16:15 +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=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF=EF=BC=88?= =?UTF-8?q?=E5=85=9A=E5=91=98=E7=AE=A1=E7=90=86=E7=94=A8=EF=BC=8C=E4=B8=BB?= =?UTF-8?q?=E8=A6=81=E6=98=BE=E7=A4=BA=E4=BD=8F=E5=9D=80=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/result/IcResiUserInfoDTO.java | 19 ++++++++++ .../controller/IcResiUserController.java | 15 ++++++++ .../com/epmet/service/IcResiUserService.java | 10 +++++ .../service/impl/IcResiUserServiceImpl.java | 37 +++++++++++++++++++ 4 files changed, 81 insertions(+) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserInfoDTO.java diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserInfoDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserInfoDTO.java new file mode 100644 index 0000000000..0457fd979d --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserInfoDTO.java @@ -0,0 +1,19 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description + * @Author zhaoqifeng + * @Date 2022/5/20 9:55 + */ +@Data +public class IcResiUserInfoDTO implements Serializable { + private static final long serialVersionUID = -6071352387529766881L; + private String icResiUserId; + private String name; + private String mobile; + private String address; +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index 7d9a20dfd9..23efa674ad 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -1070,4 +1070,19 @@ public class IcResiUserController implements ResultDataResolver { public Result icPartyMemberSync(@RequestBody IcPartyMemberDTO formDTO) { return new Result().ok(icResiUserService.icPartyMemberSync(formDTO)); } + + /** + * 根据身份证获取居民信息（党员管理用，主要显示住址） + * + * @Param tokenDto + * @Param formDTO + * @Return {@link Result< IcResiUserInfoDTO>} + * @Author zhaoqifeng + * @Date 2022/5/20 10:11 + */ + @PostMapping("getUserByIdCard") + public Result getUserByIdCard(@LoginUser TokenDto tokenDto, @RequestBody IcResiUserDTO formDTO) { + formDTO.setCustomerId(tokenDto.getCustomerId()); + return new Result().ok(icResiUserService.getUserByIdCard(formDTO)); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java index 066f1bee5c..581a012c04 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java @@ -346,4 +346,14 @@ public interface IcResiUserService extends BaseService { * @Date 2022/5/17 19:12 */ IcPartyMemberDTO icPartyMemberSync(IcPartyMemberDTO formDTO); + + /** + * 根据身份证获取居民信息（党员管理用，主要显示住址） + * + * @Param formDTO + * @Return {@link IcResiUserInfoDTO} + * @Author zhaoqifeng + * @Date 2022/5/20 9:59 + */ + IcResiUserInfoDTO getUserByIdCard(IcResiUserDTO formDTO); } 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 a20d6a304a..17c6ac7aec 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 @@ -2052,6 +2052,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.eq(IcResiUserEntity::getCustomerId, formDTO.getCustomerId()); wrapper.eq(IcResiUserEntity::getIdCard, formDTO.getIdCard()); + wrapper.eq(IcResiUserEntity::getStatus, NumConstant.ZERO_STR); user = baseDao.selectOne(wrapper); if(null == user) { return dto; @@ -2084,6 +2085,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.eq(IcResiUserEntity::getCustomerId, formDTO.getCustomerId()); wrapper.eq(IcResiUserEntity::getIdCard, formDTO.getIdCard()); + wrapper.eq(IcResiUserEntity::getStatus, NumConstant.ZERO_STR); IcResiUserEntity user = baseDao.selectOne(wrapper); //居民信息不存在时返回 if(null == user) { @@ -2124,6 +2126,41 @@ public class IcResiUserServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(IcResiUserEntity::getCustomerId, formDTO.getCustomerId()); + wrapper.eq(IcResiUserEntity::getIdCard, formDTO.getIdCard()); + wrapper.eq(IcResiUserEntity::getStatus, NumConstant.ZERO_STR); + IcResiUserEntity entity = baseDao.selectOne(wrapper); + if (null != entity) { + result.setIcResiUserId(entity.getId()); + result.setName(entity.getName()); + result.setMobile(entity.getMobile()); + //查询网格信息 + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(entity.getGridId()); + //查询房屋信息 + HouseInfoCache houseInfo = CustomerIcHouseRedis.getHouseInfo(formDTO.getCustomerId(), entity.getHomeId()); + if (null != gridInfo && null != houseInfo) { + String address = gridInfo.getAllParentName().concat(StrConstant.HYPHEN).concat(gridInfo.getGridNamePath()) + .concat(StrConstant.HYPHEN).concat(houseInfo.getNeighborHoodName()) + .concat(StrConstant.HYPHEN).concat(houseInfo.getHouseName()); + result.setAddress(address); + } + } + return result; + } + /** * desc:根据字段值获取 options * @param customerId