党员认证bug修改

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java

@@ -12,10 +12,10 @@ public enum EpmetErrorCode {
 	ALREADY_APPLIED_GROUP(8004,"该群已申请过，请耐心等待审核"),
 	LOSE_EFFICACY(8006,"此邀请链接已过期"),
 
-	MOBILE_HAS_BEEN_USED(8101, "该手机已被使用，请更换手机或使用原绑定的微信用户登录"),
+	MOBILE_HAS_BEEN_USED(8101, "该手机号已注册，请更换手机号或使用原绑定的微信账号登录"),
-	MOBILE_CODE_ERROR(8102, "手机验证码错误"),
+	MOBILE_CODE_ERROR(8102, "验证码错误"),
-	AUTO_CONFIRM_FAILED(8103, "自动认证失败"),
+	AUTO_CONFIRM_FAILED(8103, "党员注册失败"),
-	MOBILE_GET_CODE_ERROR(8104,"获取手机验证码失败"),
+	MOBILE_GET_CODE_ERROR(8104,"获取验证码失败"),
 	MESSAGE_SMS_SEND_ERROR(8105, "短信发送失败"),
 
     CANNOT_AUDIT_WARM(8201, "未注册居民不能申请热心居民，请先完善居民注册。"),

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberConfirmAutoDTO.java

@@ -135,4 +135,9 @@ public class PartymemberConfirmAutoDTO implements Serializable {
      */
 	private Date updatedTime;
 
+	/**
+	 * 比对结果
+	 */
+	private Boolean comparisonResults;
+
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberConstant.java

@@ -49,37 +49,37 @@ public interface PartyMemberConstant {
 	/**
 	 * 比对结果相同
 	 */
-	Double EQUALS = 1.0;
+	Double EQUALS = 0.0;
 
 	/**
 	 * 身份证比对结果大部分相同最低值
 	 */
-	Double ID_MOST = 0.88;
+	Double ID_MOST = 2.0;
 
 	/**
 	 * 身份证比对结果小部分相同最低值
 	 */
-	Double ID_SMALL = 0.5;
+	Double ID_SMALL = 5.0;
 
 	/**
 	 * 手机号比对结果大部分相同最低值
 	 */
-	Double MOBILE_MOST = 0.81;
+	Double MOBILE_MOST = 2.0;
 
 	/**
 	 * 手机号比对结果小部分相同最低值
 	 */
-	Double MOBILE_SMALL = 0.5;
+	Double MOBILE_SMALL = 5.0;
 
 	/**
 	 * 姓名比对结果大部分相同最低值
 	 */
-	Double NAME_MOST = 0.66;
+	Double NAME_MOST = 1.0;
 
 	/**
 	 * 姓名比对结果小部分相同最低值
 	 */
-	Double NAME_SMALL = 0.5;
+	Double NAME_SMALL = 2.0;
 
 	/**
 	 * 比对结果相同

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java

@@ -16,7 +16,8 @@ import org.springframework.web.bind.annotation.RequestBody;
  * @dscription
  * @date 2020/3/30 14:51
  */
-@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallBack.class,url="http://localhost:8087")
+@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallBack.class,url =
+		"http://localhost:8087")
 public interface EpmetUserFeignClient {
 
 	/**

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartyMemberConfirmService.java

@@ -46,4 +46,5 @@ public interface PartyMemberConfirmService {
 	 */
 	Result partyMemberInfoExtra(PartymemberInfoDTO partyMemberInfoDTO);
 
+
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberConfirmAutoService.java

@@ -93,4 +93,14 @@ public interface PartymemberConfirmAutoService extends BaseService<PartymemberCo
      * @date 2020-03-30
      */
     void delete(String[] ids);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return PartymemberConfirmAutoDTO
+     * @author generator
+     * @date 2020-03-30
+     */
+    PartymemberConfirmAutoDTO getInfoByPartyMemberInfoId(String id);
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberConfirmManualService.java

@@ -92,4 +92,12 @@ public interface PartymemberConfirmManualService extends BaseService<Partymember
 	 * @date 2020-03-30
 	 */
 	void delete(String[] ids);
+
+	/**
+	 * 单条查询
+	 *
+	 * @param partymemberInfoId
+	 * @return
+	 */
+	PartymemberConfirmManualDTO getInfoByPartyMemberInfoId(String partymemberInfoId);
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java

@@ -18,7 +18,9 @@ import com.epmet.resi.mine.dto.from.PartyMemberInitFromDTO;
 import com.epmet.resi.mine.dto.from.VerificationCodeFromDTO;
 import com.epmet.resi.mine.dto.result.PartyMemberInitResultDTO;
 import com.epmet.resi.partymember.dto.partymember.PartymemberConfirmAutoDTO;
+import com.epmet.resi.partymember.dto.partymember.PartymemberConfirmManualDTO;
 import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
+import com.epmet.resi.partymember.dto.partymember.form.PartyMemberVerifyFromDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -83,6 +85,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 			if (null != userResiInfoResult) {
 				PartymemberInfoDTO partyMemberInfo = ConvertUtils.sourceToTarget(userResiInfoResult,
 						PartymemberInfoDTO.class);
+				partyMemberInfo.setId("");
 				partyMemberInfo.setMobile(userResiInfoResult.getRegMobile());
 				partyMemberInfo.setEstate(userResiInfoResult.getDistrict());
 				partyMemberInfo.setBuilding(userResiInfoResult.getBuildingAddress());
@@ -157,13 +160,18 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 		PartymemberInfoEntity partyMemberInfoEntity = ConvertUtils.sourceToTarget(partyMemberInfoDTO,
 				PartymemberInfoEntity.class);
 
-		if (confirmAutoDTO == null || confirmAutoDTO.getResult().compareTo(PartyMemberConstant.BENCHMARK) < 0) {
+		if (confirmAutoDTO == null || (confirmAutoDTO.getResult().compareTo(PartyMemberConstant.BENCHMARK) < 0 && !confirmAutoDTO.getComparisonResults())) {
 			//将访问记录更新到热心居民申请行为记录表
 			saveOrUpdateVisit(partyMemberInfoDTO.getPartymemberVisitId(), null, PartyMemberConstant.OPERATE_AUTO_FAILED);
 
 			//自动认证失败
 			partyMemberInfoEntity.setConfirmResult("1");
+			if (partyMemberInfoEntity.getId().isEmpty()) {
 				partymemberInfoService.insert(partyMemberInfoEntity);
+			} else {
+				partymemberInfoService.updateById(partyMemberInfoEntity);
+			}
+
 
 			result.setCode(EpmetErrorCode.AUTO_CONFIRM_FAILED.getCode());
 			result.setMsg(EpmetErrorCode.AUTO_CONFIRM_FAILED.getMsg());
@@ -173,7 +181,11 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 
 			//自动认证成功
 			partyMemberInfoEntity.setConfirmResult("0");
+			if (partyMemberInfoEntity.getId().isEmpty()) {
 				partymemberInfoService.insert(partyMemberInfoEntity);
+			} else {
+				partymemberInfoService.updateById(partyMemberInfoEntity);
+			}
 
 			//添加用户党员角色关系
 			UserRoleDTO userRole = new UserRoleDTO();
@@ -188,9 +200,17 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 
 		//将自动认证结果存入党员认证自动审核表
 		if (confirmAutoDTO != null) {
+			PartymemberConfirmAutoDTO partymemberConfirmAutoDTO =
+					partymemberConfirmAutoService.getInfoByPartyMemberInfoId(partyMemberInfoEntity.getPartymemberVisitId());
 			confirmAutoDTO.setPartymemberInfoId(partyMemberInfoEntity.getPartymemberVisitId());
+			if (null == partymemberConfirmAutoDTO) {
 				partymemberConfirmAutoService.insert(ConvertUtils.sourceToTarget(confirmAutoDTO,
 						PartymemberConfirmAutoEntity.class));
+			} else {
+				confirmAutoDTO.setId(partymemberConfirmAutoDTO.getId());
+				partymemberConfirmAutoService.updateById(ConvertUtils.sourceToTarget(confirmAutoDTO,
+						PartymemberConfirmAutoEntity.class));
+			}
 		}
 
 		//判断是否已注册居民，如果没有则注册居民
@@ -209,7 +229,10 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 		PartymemberInfoDTO partyMemberInfo = partymemberInfoService.getPartyMemberInfo(infoDTO);
 		infoDTO.setId(partyMemberInfo.getId());
 		partymemberInfoService.updateById(ConvertUtils.sourceToTarget(infoDTO, PartymemberInfoEntity.class));
+		PartymemberConfirmManualDTO partymemberConfirmManualDTO =
+				partymemberConfirmManualService.getInfoByPartyMemberInfoId(partyMemberInfo.getId());
 
+		if (null == partymemberConfirmManualDTO) {
 			//待审核数据存入党员认证人工审核表
 			PartymemberConfirmManualEntity manualEntity = new PartymemberConfirmManualEntity();
 			manualEntity.setCustomerId(infoDTO.getCustomerId());
@@ -218,6 +241,8 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 			manualEntity.setPartymemberInfoId(infoDTO.getId());
 			manualEntity.setAuditStatus(PartyMemberConstant.UNDER_AUDITTING);
 			partymemberConfirmManualService.insert(manualEntity);
+		}
+
 
 		return new Result();
 	}

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberBaseInfoServiceImpl.java

@@ -31,7 +31,7 @@ import com.epmet.modules.partymember.service.PartymemberBaseInfoService;
 import com.epmet.resi.partymember.dto.partymember.PartymemberBaseInfoDTO;
 import com.epmet.resi.partymember.dto.partymember.PartymemberConfirmAutoDTO;
 import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
-import info.debatty.java.stringsimilarity.JaroWinkler;
+import info.debatty.java.stringsimilarity.Levenshtein;
 import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -129,7 +129,7 @@ public class PartymemberBaseInfoServiceImpl extends BaseServiceImpl<PartymemberB
 					idCardList.stream().filter(baseInfo -> baseInfo.getMobile().equals(partyMemberInfo.getMobile())).findFirst();
 
 			if (matchingResult.isPresent()) {
-				confirmAutoDTO = getResult(matchingResult.get(), partyMemberInfo);
+				confirmAutoDTO = getResult(matchingResult.get(), partyMemberInfo, true);
 				return confirmAutoDTO;
 			}
 
@@ -137,7 +137,7 @@ public class PartymemberBaseInfoServiceImpl extends BaseServiceImpl<PartymemberB
 			matchingResult = idCardList.stream().filter(baseInfo -> baseInfo.getName().equals(name)).findFirst();
 
 			if (matchingResult.isPresent()) {
-				confirmAutoDTO = getResult(matchingResult.get(), partyMemberInfo);
+				confirmAutoDTO = getResult(matchingResult.get(), partyMemberInfo, true);
 				return confirmAutoDTO;
 			}
 
@@ -147,7 +147,7 @@ public class PartymemberBaseInfoServiceImpl extends BaseServiceImpl<PartymemberB
 
 		} else {
 			//根据手机号匹配数据
-			List<PartymemberBaseInfoEntity> mobileList = baseDao.selectBaseInfoByIdCard(partyMemberInfo);
+			List<PartymemberBaseInfoEntity> mobileList = baseDao.selectBaseInfoByMobile(partyMemberInfo);
 
 			if (null != mobileList && mobileList.size() > 0) {
 				//判断手机号和姓名
@@ -155,7 +155,7 @@ public class PartymemberBaseInfoServiceImpl extends BaseServiceImpl<PartymemberB
 						mobileList.stream().filter(baseInfo -> baseInfo.getName().equals(name)).findFirst();
 
 				if (matchingResult.isPresent()) {
-					confirmAutoDTO = getResult(matchingResult.get(), partyMemberInfo);
+					confirmAutoDTO = getResult(matchingResult.get(), partyMemberInfo, true);
 					return confirmAutoDTO;
 				}
 
@@ -164,7 +164,7 @@ public class PartymemberBaseInfoServiceImpl extends BaseServiceImpl<PartymemberB
 						getSimilarity(p, partyMemberInfo)).reversed()).collect(Collectors.toList()).get(0));
 			} else {
 				//根据姓名匹配数据
-				List<PartymemberBaseInfoEntity> nameList = baseDao.selectBaseInfoByIdCard(partyMemberInfo);
+				List<PartymemberBaseInfoEntity> nameList = baseDao.selectBaseInfoByName(partyMemberInfo);
 
 				if (null != nameList && nameList.size() > 0) {
 					//获取匹配度最高的数据
@@ -175,13 +175,20 @@ public class PartymemberBaseInfoServiceImpl extends BaseServiceImpl<PartymemberB
 							nameList.stream().sorted(Comparator.comparing((PartymemberBaseInfoEntity p) ->
 									getSimilarity(p, partyMemberInfo)).reversed()).collect(Collectors.toList()).get(0);
 
-					confirmAutoDTO = getResult(similar, partyMemberInfo);
+					confirmAutoDTO = getResult(similar, partyMemberInfo, false);
 					return confirmAutoDTO;
 
+				} else {
+					return null;
 				}
 			}
 		}
-		return null;
+
+		 PartymemberBaseInfoEntity similar =
+				sortList.stream().sorted(Comparator.comparing((PartymemberBaseInfoEntity p) ->
+				getSimilarity(p, partyMemberInfo)).reversed()).collect(Collectors.toList()).get(0);
+
+		return getResult(similar, partyMemberInfo, false);
 	}
 
 
@@ -192,7 +199,8 @@ public class PartymemberBaseInfoServiceImpl extends BaseServiceImpl<PartymemberB
 	 * @param info     录入信息
 	 * @return PartymemberConfirmAutoDTO
 	 */
-	private PartymemberConfirmAutoDTO getResult(PartymemberBaseInfoEntity baseInfo, PartymemberInfoDTO info) {
+	private PartymemberConfirmAutoDTO getResult(PartymemberBaseInfoEntity baseInfo, PartymemberInfoDTO info,
+												boolean comparisonResults) {
 		PartymemberConfirmAutoDTO confirmAutoDTO = new PartymemberConfirmAutoDTO();
 		confirmAutoDTO.setPatryMemberBaseInfoId(baseInfo.getId());
 		confirmAutoDTO.setBaseName(baseInfo.getName());
@@ -200,8 +208,9 @@ public class PartymemberBaseInfoServiceImpl extends BaseServiceImpl<PartymemberB
 		confirmAutoDTO.setBaseIdCard(baseInfo.getIdCard());
 		confirmAutoDTO.setInputIdCard(info.getIdCard());
 		confirmAutoDTO.setBaseMobile(baseInfo.getMobile());
-		confirmAutoDTO.setInputMobile(info.getIdCard());
+		confirmAutoDTO.setInputMobile(info.getMobile());
 		confirmAutoDTO.setContrastTime(new Date());
+		confirmAutoDTO.setComparisonResults(comparisonResults);
 		String result = getSimilarity(baseInfo, info);
 		//身份证比对结果
 		if (EQUAL.equals(result.substring(START, ID_CARD_COUNT))) {
@@ -237,10 +246,10 @@ public class PartymemberBaseInfoServiceImpl extends BaseServiceImpl<PartymemberB
 
 		String result = "";
 
-		JaroWinkler jw = new JaroWinkler();
+		Levenshtein levenshtein = new Levenshtein();
-		double idCardResult = jw.similarity(baseInfo.getIdCard(), info.getIdCard());
+		double idCardResult = levenshtein.distance(baseInfo.getIdCard(), info.getIdCard());
-		double mobileResult = jw.similarity(baseInfo.getMobile(), info.getMobile());
+		double mobileResult = levenshtein.distance(baseInfo.getMobile(), info.getMobile());
-		double nameResult = jw.similarity(baseInfo.getName(), info.getSurname() + info.getName());
+		double nameResult = levenshtein.distance(baseInfo.getName(), info.getSurname() + info.getName());
 		result = getString(result, idCardResult, PartyMemberConstant.ID_MOST, PartyMemberConstant.ID_SMALL);
 
 		result = getString(result, mobileResult, PartyMemberConstant.MOBILE_MOST, PartyMemberConstant.MOBILE_SMALL);
@@ -255,9 +264,9 @@ public class PartymemberBaseInfoServiceImpl extends BaseServiceImpl<PartymemberB
 	private String getString(String result, double comparisonResult, double most, double small) {
 		if (comparisonResult == PartyMemberConstant.EQUALS) {
 			result = result + "11";
-		} else if (comparisonResult > most) {
+		} else if (comparisonResult <= most) {
 			result = result + "10";
-		} else if (comparisonResult < small) {
+		} else if (comparisonResult >= small) {
 			result = result + "00";
 		} else {
 			result = result + "01";

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberConfirmAutoServiceImpl.java

@@ -39,7 +39,7 @@ import java.util.Map;
 
 /**
  * 党员认证自动审核表
-只有在根据三项比对在partymember_base_info表有查询到数据 并且有一项的比对结果是11的才会在自动审核表有记录
+ * 只有在根据三项比对在partymember_base_info表有查询到数据 并且有一项的比对结果是11的才会在自动审核表有记录
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-03-30
@@ -102,4 +102,12 @@ public class PartymemberConfirmAutoServiceImpl extends BaseServiceImpl<Partymemb
 		baseDao.deleteBatchIds(Arrays.asList(ids));
 	}
 
+	@Override
+	public PartymemberConfirmAutoDTO getInfoByPartyMemberInfoId(String partymemberInfoId) {
+		QueryWrapper<PartymemberConfirmAutoEntity> wrapper = new QueryWrapper<>();
+		wrapper.eq(StringUtils.isNotBlank(partymemberInfoId), "PARTYMEMBER_INFO_ID", partymemberInfoId);
+		PartymemberConfirmAutoEntity entity = baseDao.selectOne(wrapper);
+		return ConvertUtils.sourceToTarget(entity, PartymemberConfirmAutoDTO.class);
+	}
+
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberConfirmManualServiceImpl.java

@@ -101,4 +101,12 @@ public class PartymemberConfirmManualServiceImpl extends BaseServiceImpl<Partyme
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    public PartymemberConfirmManualDTO getInfoByPartyMemberInfoId(String partymemberInfoId) {
+        QueryWrapper<PartymemberConfirmManualEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(partymemberInfoId), "PARTYMEMBER_INFO_ID", partymemberInfoId);
+        PartymemberConfirmManualEntity entity = baseDao.selectOne(wrapper);
+        return ConvertUtils.sourceToTarget(entity, PartymemberConfirmManualDTO.class);
+    }
+
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml

@@ -31,14 +31,17 @@
     <select id="selectPartyMemberInfo" resultType="com.epmet.modules.partymember.entity.PartymemberInfoEntity"
             parameterType="com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO">
         SELECT
-            *
+            pi.*
         FROM
-            epmet_resi_partymember.partymember_info
+            epmet_resi_partymember.partymember_info pi
+                LEFT JOIN epmet_resi_partymember.partymember_confirm_manual pcm ON pi.ID = pcm.PARTYMEMBER_INFO_ID
+                AND pcm.DEL_FLAG = 0
         WHERE
-            CUSTOMER_ID = #{customerId}
+            pi.CUSTOMER_ID = #{customerId}
-          AND GRID_ID = #{gridId}
+          AND pi.GRID_ID = #{gridId}
-          AND USER_ID = #{userId}
+          AND pi.USER_ID = #{userId}
-          AND DEL_FLAG = 0
+          AND pi.DEL_FLAG = 0
+          AND pcm.AUDIT_STATUS = 'under_auditting'
     </select>
     <select id="selectPartyMemberInfoByMobile"
             parameterType="com.epmet.modules.partymember.entity.PartymemberInfoEntity"