From 0e5b917f8e0fc5c78067f36b47b97d6a9699e51b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 20 Oct 2022 09:52:31 +0800 Subject: [PATCH 01/11] =?UTF-8?q?1=E3=80=81=E5=B1=85=E6=B0=91=E9=98=B2?= =?UTF-8?q?=E7=96=AB=E4=BF=A1=E6=81=AF=E6=9F=A5=E7=9C=8B/epmetuser/epidemi?= =?UTF-8?q?cPrevention/detail=E6=89=8B=E6=9C=BA=E5=8F=B7=E8=BA=AB=E4=BB=BD?= =?UTF-8?q?=E8=AF=81=E5=8F=B7=E8=84=B1=E6=95=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/IcEpidemicPreventionController.java | 1 + 1 file changed, 1 insertion(+) 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 3fd2bd60fc..e06bed1fc6 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,6 +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 }) @PostMapping("detail") public Result detail(@LoginUser TokenDto tokenDto, @RequestBody EpidemicPreventionFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); From 55a24ec49cff3b919b5365aca86130a285c7ca04 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 20 Oct 2022 10:34:42 +0800 Subject: [PATCH 02/11] =?UTF-8?q?menu/batch-save=E6=96=B9=E4=BE=BF?= =?UTF-8?q?=E6=88=91=E8=87=AA=E5=B7=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/controller/OperMenuController.java | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperMenuController.java b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperMenuController.java index c04455b92e..e29946ca4c 100644 --- a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperMenuController.java +++ b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperMenuController.java @@ -1,11 +1,9 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; -import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.exception.ErrorCode; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; -import com.epmet.commons.tools.utils.EpmetRequestHolder; import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.AssertUtils; @@ -69,6 +67,23 @@ public class OperMenuController { return new Result(); } + /** + * 疯狂家按钮，我要写个接口批量赠.... + * @param formList + * @param tokenDto + * @return + */ + @PostMapping("batch-save") + public Result save(@RequestBody List formList, @LoginUser TokenDto tokenDto){ + //效验数据 + ValidatorUtils.validateEntity(formList, AddGroup.class, DefaultGroup.class); + for(OperMenuDTO dto:formList){ + operMenuService.save(dto,tokenDto); + } + return new Result(); + } + + @PutMapping public Result update(@RequestBody OperMenuDTO dto, @LoginUser TokenDto tokenDto){ //效验数据 From ea3b3119d9a5e5c3f8ed2314620ead7528e16c8f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 20 Oct 2022 10:35:30 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E9=9D=A0=EF=BC=8C=E5=8A=A0=E9=94=99?= =?UTF-8?q?=E5=9C=B0=E6=96=B9=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/controller/OperMenuController.java | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperMenuController.java b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperMenuController.java index e29946ca4c..b9146e88ad 100644 --- a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperMenuController.java +++ b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperMenuController.java @@ -67,23 +67,6 @@ public class OperMenuController { return new Result(); } - /** - * 疯狂家按钮，我要写个接口批量赠.... - * @param formList - * @param tokenDto - * @return - */ - @PostMapping("batch-save") - public Result save(@RequestBody List formList, @LoginUser TokenDto tokenDto){ - //效验数据 - ValidatorUtils.validateEntity(formList, AddGroup.class, DefaultGroup.class); - for(OperMenuDTO dto:formList){ - operMenuService.save(dto,tokenDto); - } - return new Result(); - } - - @PutMapping public Result update(@RequestBody OperMenuDTO dto, @LoginUser TokenDto tokenDto){ //效验数据 From 6532184e73f20b7e4b597e5fe2407134db77caed Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 20 Oct 2022 10:37:00 +0800 Subject: [PATCH 04/11] /gov/access/menu/batch-save --- .../com/epmet/controller/GovMenuController.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovMenuController.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovMenuController.java index ef763f4a43..69de505fed 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovMenuController.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovMenuController.java @@ -59,6 +59,22 @@ public class GovMenuController { return new Result(); } + /** + * 疯狂家按钮，我要写个接口批量赠.... + * @param formList + * @param tokenDto + * @return + */ + @PostMapping("batch-save") + public Result save(@RequestBody List formList, @LoginUser TokenDto tokenDto){ + //效验数据 + ValidatorUtils.validateEntity(formList, AddGroup.class, DefaultGroup.class); + for(GovMenuDTO dto:formList){ + govMenuService.save(dto,tokenDto); + } + return new Result(); + } + @PutMapping public Result update(@RequestBody GovMenuDTO dto, @LoginUser TokenDto tokenDto){ //效验数据 From 5e5a7df0c229e921b88035dcdcda29c67ae6c782 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 20 Oct 2022 11:59:51 +0800 Subject: [PATCH 05/11] =?UTF-8?q?2=E3=80=81=E8=A1=8C=E7=A8=8B=E4=B8=8A?= =?UTF-8?q?=E6=8A=A5=E8=AF=A6=E6=83=85=EF=BC=9A/epmetuser/tripreport/detai?= =?UTF-8?q?l=20=E6=89=8B=E6=9C=BA=E5=8F=B7=E8=BA=AB=E4=BB=BD=E8=AF=81?= =?UTF-8?q?=E5=8F=B7=E5=8A=A0=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/controller/IcTripReportRecordController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java index aea630040c..5e4aba1748 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java @@ -88,6 +88,7 @@ public class IcTripReportRecordController implements ResultDataResolver { * @param formDTO * @return */ + @MaskResponse(fieldNames = { "mobile", "idCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD }) @PostMapping("detail") public Result detail(@LoginUser TokenDto tokenDto,@RequestBody IcTripReportRecordDTO formDTO){ ValidatorUtils.validateEntity(formDTO,IcTripReportRecordDTO.DetailViewGroup.class); From 63bd61919493d2351cb1cf3f94a4b751b8d6d7e3 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 20 Oct 2022 12:03:49 +0800 Subject: [PATCH 06/11] =?UTF-8?q?3=E3=80=81=E7=96=AB=E8=8B=97=E6=8E=A5?= =?UTF-8?q?=E7=A7=8D=E8=AE=B0=E5=BD=95=E6=9F=A5=E7=9C=8B/epmetuser/icVacci?= =?UTF-8?q?ne/detail=EF=BC=8CshowMobile,showIdCard=E5=8A=A0=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/IcVaccineDTO.java | 4 ++-- .../java/com/epmet/controller/IcVaccineController.java | 1 + .../com/epmet/service/impl/IcVaccineServiceImpl.java | 9 ++++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccineDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccineDTO.java index 115eeb2154..b9dca879b0 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccineDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccineDTO.java @@ -36,12 +36,12 @@ public class IcVaccineDTO implements Serializable { * 手机号 */ private String mobile; - + private String showMobile; /** * 身份证号 */ private String idCard; - + private String showIdCard; /** * 是否客户下居民(0:否 1:是) */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccineController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccineController.java index bb34afd612..8c742919a7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccineController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccineController.java @@ -231,6 +231,7 @@ public class IcVaccineController implements ResultDataResolver { * @Author sun * @Description 疫苗接种情况-列表点击查询详情 **/ + @MaskResponse(fieldNames = { "showMobile", "showIdCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD }) @NoRepeatSubmit @PostMapping("detail") public Result detail(@RequestBody IcVaccineFormDTO formDTO) { diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java index 09da4b8ee2..6d183807ab 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java @@ -21,14 +21,12 @@ import com.epmet.constants.ImportTaskConstants; import com.epmet.dao.IcResiUserDao; import com.epmet.dao.IcVaccineDao; import com.epmet.dao.IcVaccineRelationDao; -import com.epmet.dto.IcNatDTO; import com.epmet.dto.IcVaccineDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.IcVaccineListResultDTO; import com.epmet.dto.result.LoginUserDetailsResultDTO; import com.epmet.dto.result.UploadImgResultDTO; import com.epmet.dto.result.VaccineListDTO; -import com.epmet.entity.IcNatEntity; import com.epmet.entity.IcResiUserEntity; import com.epmet.entity.IcVaccineEntity; import com.epmet.entity.IcVaccineRelationEntity; @@ -480,7 +478,12 @@ public class IcVaccineServiceImpl extends BaseServiceImpl Date: Thu, 20 Oct 2022 12:32:39 +0800 Subject: [PATCH 07/11] =?UTF-8?q?/epmetuser/tripreport/detail=E5=BD=A2?= =?UTF-8?q?=E6=88=90=E4=B8=8A=E6=8A=A5=E8=BF=94=E5=9B=9EshowMobile?= =?UTF-8?q?=E3=80=81showIdCard?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/IcTripReportRecordDTO.java | 8 ++++---- .../epmet/controller/IcTripReportRecordController.java | 2 +- .../epmet/service/impl/IcTripReportRecordServiceImpl.java | 7 ++++++- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java index 9d2ab97099..ea4a456f41 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java @@ -77,9 +77,9 @@ public class IcTripReportRecordDTO implements Serializable { private String mobile; /** - * 真实手机号不打码 + * 脱敏 */ - private String realMobile; + private String showMobile; /** * 身份证号 @@ -89,9 +89,9 @@ public class IcTripReportRecordDTO implements Serializable { private String idCard; /** - * 真实身份证号 + * 脱敏 */ - private String realIdCard; + private String showIdCard; /** * 用户id diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java index 5e4aba1748..02bc139e51 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java @@ -88,7 +88,7 @@ public class IcTripReportRecordController implements ResultDataResolver { * @param formDTO * @return */ - @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 IcTripReportRecordDTO formDTO){ ValidatorUtils.validateEntity(formDTO,IcTripReportRecordDTO.DetailViewGroup.class); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java index a758fdba92..bd920882f0 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java @@ -464,6 +464,11 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl Date: Thu, 20 Oct 2022 12:43:50 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E5=BD=A2=E6=88=90=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=98=AF=E5=8A=A0=E5=AF=86=E7=9A=84=EF=BC=8C?= =?UTF-8?q?=E8=BF=98=E4=B8=8D=E8=83=BD=E5=8E=BB=E6=8E=89realMobile?= =?UTF-8?q?=E3=80=81realIdCard?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/IcTripReportRecordDTO.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java index ea4a456f41..e88ef1deb7 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java @@ -76,6 +76,11 @@ public class IcTripReportRecordDTO implements Serializable { @ExcelProperty("手机号") private String mobile; + /** + * 真实手机号不打码 + */ + private String realMobile; + /** * 脱敏 */ @@ -88,6 +93,11 @@ public class IcTripReportRecordDTO implements Serializable { @ExcelProperty("身份证号") private String idCard; + /** + * 真实身份证号 + */ + private String realIdCard; + /** * 脱敏 */ From 73b7ff7f8b7f577d1451207593d46f7c1ae0f178 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 20 Oct 2022 12:48:21 +0800 Subject: [PATCH 09/11] =?UTF-8?q?5=E3=80=81=E7=96=AB=E8=8B=97=E6=8E=A5?= =?UTF-8?q?=E7=A7=8D=E5=85=B3=E6=B3=A8=E5=90=8D=E5=8D=95=E8=AF=A6=E6=83=85?= =?UTF-8?q?=EF=BC=9A/epmetuser/icEpidemicSpecialAttention/detail=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0show?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/result/VaccinationListResultDTO.java | 9 ++++++++- .../controller/IcEpidemicSpecialAttentionController.java | 1 + .../impl/IcEpidemicSpecialAttentionServiceImpl.java | 7 ++++++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VaccinationListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VaccinationListResultDTO.java index 7099e1650b..c48363e679 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VaccinationListResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VaccinationListResultDTO.java @@ -42,7 +42,10 @@ public class VaccinationListResultDTO implements Serializable { * 真实手机号 */ private String realMobile; - + /** + * 脱敏详情用 + */ + private String showMobile; /** * 身份证 */ @@ -52,6 +55,10 @@ public class VaccinationListResultDTO implements Serializable { * 真实的身份证 */ private String realIdCard; + /** + * 脱敏详情用 + */ + private String showIdCard; private String sex; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicSpecialAttentionController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicSpecialAttentionController.java index 3ebd6d4f84..85cf3c302e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicSpecialAttentionController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicSpecialAttentionController.java @@ -87,6 +87,7 @@ public class IcEpidemicSpecialAttentionController { * @author zxc * @date 2022/4/27 15:47 */ + @MaskResponse(fieldNames = { "showMobile", "showIdCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD }) @PostMapping("detail") public Result detail(@RequestBody AttentionDetailFormDTO formDTO){ ValidatorUtils.validateEntity(formDTO,VaccinationListFormDTO.VaccinationListForm.class); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java index 65070ee096..a51b81e28d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java @@ -578,7 +578,12 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl Date: Thu, 20 Oct 2022 12:52:24 +0800 Subject: [PATCH 10/11] =?UTF-8?q?1=E3=80=81=E5=B1=85=E6=B0=91=E9=98=B2?= =?UTF-8?q?=E7=96=AB=E4=BF=A1=E6=81=AF=E6=9F=A5=E7=9C=8B/epmetuser/epidemi?= =?UTF-8?q?cPrevention/detail=E6=89=8B=E6=9C=BA=E5=8F=B7=E8=BA=AB=E4=BB=BD?= =?UTF-8?q?=E8=AF=81=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) { From 71553b7a81bec9b95d4ab1a2f77e3d8d570e2bc3 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 20 Oct 2022 13:05:33 +0800 Subject: [PATCH 11/11] =?UTF-8?q?7=E3=80=81=E6=A0=B8=E9=85=B8=E6=A3=80?= =?UTF-8?q?=E6=B5=8B=E8=AE=B0=E5=BD=95=E8=AF=A6=E6=83=85=EF=BC=9A/epmetuse?= =?UTF-8?q?r/icNat/detail=E8=BF=94=E5=9B=9Eshow?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/IcNatDTO.java | 9 +++++++++ .../main/java/com/epmet/controller/IcNatController.java | 1 + .../java/com/epmet/service/impl/IcNatServiceImpl.java | 3 ++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatDTO.java index dbd32f4463..0b0e41294e 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatDTO.java @@ -61,6 +61,15 @@ public class IcNatDTO implements Serializable { */ private String idCard; + /** + * 脱敏详情用 + */ + private String showMobile; + /** + * 脱敏详情用 + */ + private String showIdCard; + /** * 检测时间，精确到分钟 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java index bcb2a2d134..a365373784 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java @@ -125,6 +125,7 @@ public class IcNatController implements ResultDataResolver { * @Author sun * @Description 【核酸】核酸检测信息详情 **/ + @MaskResponse(fieldNames = { "showMobile", "showIdCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD }) @NoRepeatSubmit @PostMapping("detail") public Result detail(@RequestBody MyNatListFormDTO formDTO) { diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java index 40d9818db8..622157306c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java @@ -198,7 +198,8 @@ public class IcNatServiceImpl extends BaseServiceImpl imp return resultDTO; } resultDTO = ConvertUtils.sourceToTarget(entity, IcNatDTO.class); - + resultDTO.setShowIdCard(resultDTO.getIdCard()); + resultDTO.setShowMobile(resultDTO.getMobile()); //2.查询对应的通知记录信息 IcNoticeDTO dto = icNoticeService.getNotice(entity.getCustomerId(), entity.getIdCard()); if (null != dto) {