From ed87e2e715e70986a146a37844254c2ad6be5ce3 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 20 Oct 2022 12:52:24 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=B1=85=E6=B0=91=E9=98=B2=E7=96=AB?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=9F=A5=E7=9C=8B/epmetuser/epidemicPreventi?= =?UTF-8?q?on/detail=E6=89=8B=E6=9C=BA=E5=8F=B7=E8=BA=AB=E4=BB=BD=E8=AF=81?= =?UTF-8?q?=E5=8F=B7=E8=84=B1=E6=95=8F,show?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/result/EpidemicPreventionResultDTO.java | 9 +++++++++ .../epmet/controller/IcEpidemicPreventionController.java | 2 +- .../com/epmet/service/impl/IcResiUserServiceImpl.java | 4 +++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EpidemicPreventionResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EpidemicPreventionResultDTO.java index 4946982090..f65d4f32cc 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EpidemicPreventionResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EpidemicPreventionResultDTO.java @@ -38,6 +38,15 @@ public class EpidemicPreventionResultDTO implements Serializable { */ private String idCard; + /** + * 脱敏详情用 + */ + private String showMobile; + /** + * 脱敏详情用 + */ + private String showIdCard; + private String birthDay; /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicPreventionController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicPreventionController.java index e06bed1fc6..8301cc6b54 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicPreventionController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicPreventionController.java @@ -82,7 +82,7 @@ public class IcEpidemicPreventionController{ * @Author zhaoqifeng * @Date 2022/3/29 16:13 */ - @MaskResponse(fieldNames = { "mobile", "idCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD }) + @MaskResponse(fieldNames = { "showMobile", "showIdCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD }) @PostMapping("detail") public Result detail(@LoginUser TokenDto tokenDto, @RequestBody EpidemicPreventionFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); 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 ec9bf3043c..ae6af1e11f 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 @@ -1748,8 +1748,10 @@ public class IcResiUserServiceImpl extends BaseServiceImpl list = baseDao.getEpidemicPreventionList(formDTO); - if (CollectionUtils.isNotEmpty(list)) { + if (CollectionUtils.isNotEmpty(list) && null != list.get(NumConstant.ZERO)) { result = list.get(NumConstant.ZERO); + result.setShowIdCard(result.getIdCard()); + result.setShowMobile(result.getMobile()); //查询网格名称 GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(result.getGridId()); if (null != gridInfo) {