From 45788748033717b86b78871d999b1b32633a5e75 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 23 Aug 2022 10:55:55 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=AF=81=E4=BB=B6=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E3=80=91=E6=8A=A4=E7=85=A7-=E4=BF=AE=E5=A4=8D=E5=B1=85?= =?UTF-8?q?=E6=B0=91=E5=AF=BC=E5=85=A5=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IcResiUserImportServiceImpl.java | 43 +++---------------- 1 file changed, 6 insertions(+), 37 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java index 342fb23760..0b10e9fc61 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java @@ -630,44 +630,12 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res } // ================== 数据补充 =================== - String year = null, month = null, day = null, sex = null; - - //if (idCard.length() == 15) { - // // 身份证 - // Matcher matcher = PATTERN_15_ID.matcher(idCard); - // if (matcher.matches()) { - // year = "19".concat(matcher.group("year")); - // month = matcher.group("month"); - // day = matcher.group("day"); - // sex = matcher.group("sex"); - // } else { - // String s = "证件号解析错误"; - // throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), s, s); - // } - //} else if (idCard.length() == 18) { - // // 身份证 - // Matcher matcher = PATTERN_18_ID.matcher(idCard); - // if (matcher.matches()) { - // year = matcher.group("year"); - // month = matcher.group("month"); - // day = matcher.group("day"); - // sex = matcher.group("sex"); - // } else { - // String s = "证件号解析错误"; - // throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), s, s); - // } - //} else if (idCard.length() == 9) { - // // 护照 - // Matcher matcher = PATTERN_9_PASSPORT.matcher(idCard); - // if (matcher.matches()) { - // idCardType = IdCardTypeEnum.PASSPORT.getType(); - // } - //} else { - // String s = "证件号解析错误"; - // throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), s, s); - //} - IdCardRegexUtils regexUtilInstance = IdCardRegexUtils.parse(idCard); + if (regexUtilInstance == null) { + String s = "请输入正确的证件号"; + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), s, s); + } + IdCardTypeEnum idCardType = regexUtilInstance.getTypeEnum(); if (idCardType == null || IdCardTypeEnum.OTHERS == idCardType) { @@ -676,6 +644,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res } IdCardRegexUtils.ParsedContent parsedResult = regexUtilInstance.getParsedResult(); + String year = null, month = null, day = null, sex = null; if (parsedResult != null) { year = parsedResult.getBirthdayYear(); month = parsedResult.getBirthdayMonth();