From a5c502608534140f40c6c9046fcc32cde2dbed58 Mon Sep 17 00:00:00 2001 From: hosinokamui Date: Fri, 3 Apr 2020 09:28:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=85=9A=E5=91=98?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/constant/PartyMemberConstant.java | 6 ++- .../impl/PartyMemberConfirmServiceImpl.java | 1 + .../impl/PartymemberBaseInfoServiceImpl.java | 43 +++++++++---------- .../service/impl/UserRoleServiceImpl.java | 1 + 4 files changed, 27 insertions(+), 24 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberConstant.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberConstant.java index a544a768d9..777e83dcbe 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberConstant.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberConstant.java @@ -47,9 +47,13 @@ public interface PartyMemberConstant { String BENCHMARK = "110010"; /** - * 比对结果大部分相同最低值 + * 比对结果相同 */ + Double EQUALS = 1.0; + /** + * 比对结果大部分相同最低值 + */ Double MOST = 0.8; /** diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java index ff7c2ca523..63c36c221c 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java @@ -156,6 +156,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService saveOrUpdateVisit(partyMemberInfoDTO.getPartymemberVisitId(), null, PartyMemberConstant.OPERATE_AUTO_SUCCESS); //添加用户党员角色关系 UserRoleDTO userRole = new UserRoleDTO(); + userRole.setCustomerId(partyMemberInfoDTO.getCustomerId()); userRole.setUserId(partyMemberInfoDTO.getUserId()); userRole.setRoleKey(EpmetRoleKeyConstant.PARTYMEMBER); userRole.setApp(partyMemberInfoDTO.getApp()); diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberBaseInfoServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberBaseInfoServiceImpl.java index 37d11ff2db..656daf2032 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberBaseInfoServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberBaseInfoServiceImpl.java @@ -33,6 +33,7 @@ import com.epmet.resi.partymember.dto.partymember.PartymemberConfirmAutoDTO; import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO; import info.debatty.java.stringsimilarity.JaroWinkler; import org.apache.commons.lang3.StringUtils; +import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -188,7 +189,7 @@ public class PartymemberBaseInfoServiceImpl extends BaseServiceImpl PartyMemberConstant.MOST) { - result.concat("10"); - } else if (idCardResult < PartyMemberConstant.SMALL) { - result.concat("00"); - } else { - result.concat("01"); - } + double nameResult = jw.similarity(baseInfo.getName(), info.getSurname() + info.getName()); + result = getString(result, idCardResult); - if (mobileResult > PartyMemberConstant.MOST) { - result.concat("10"); - } else if (mobileResult < PartyMemberConstant.SMALL) { - result.concat("00"); - } else { - result.concat("01"); - } + result = getString(result, mobileResult); - if (nameResult > PartyMemberConstant.MOST) { - result.concat("10"); - } else if (nameResult < PartyMemberConstant.SMALL) { - result.concat("00"); - } else { - result.concat("01"); - } + result = getString(result, nameResult); return result; } + @NotNull + private String getString(String result, double comparisonResult) { + if(comparisonResult == PartyMemberConstant.EQUALS) { + result = result + "11"; + } else if (comparisonResult > PartyMemberConstant.MOST) { + result = result + "10"; + } else if (comparisonResult < PartyMemberConstant.SMALL) { + result = result + "00"; + } else { + result = result + "01"; + } + return result; + } + } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserRoleServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserRoleServiceImpl.java index 764d260d41..26ff34860b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserRoleServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserRoleServiceImpl.java @@ -126,6 +126,7 @@ public class UserRoleServiceImpl extends BaseServiceImpl