elink-star
/
ShibeiWorkPlatform
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

党员认证bug修改

dev_shibei_match
zhaoqifeng 5 years ago
parent
24cfd06fcf
commit
b7f5e8b909
12 changed files with 237 additions and 159 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
  2. 5
      epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberConfirmAutoDTO.java
  3. 14
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberConstant.java
  4. 3
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java
  5. 1
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartyMemberConfirmService.java
  6. 10
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberConfirmAutoService.java
  7. 116
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberConfirmManualService.java
  8. 55
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java
  9. 41
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberBaseInfoServiceImpl.java
  10. 120
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberConfirmAutoServiceImpl.java
  11. 8
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberConfirmManualServiceImpl.java
  12. 15
      epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml

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

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

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

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

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

@ -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;
/**
* 比对结果相同

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

@ -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 {
/**

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

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

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

@ -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);
}

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

@ -33,63 +33,71 @@ import java.util.Map;
*/
public interface PartymemberConfirmManualService extends BaseService<PartymemberConfirmManualEntity> {
/**
* 默认分页
*
* @param params
* @return PageData<PartymemberConfirmManualDTO>
* @author generator
* @date 2020-03-30
*/
PageData<PartymemberConfirmManualDTO> page(Map<String, Object> params);
/**
* 默认分页
*
* @param params
* @return PageData<PartymemberConfirmManualDTO>
* @author generator
* @date 2020-03-30
*/
PageData<PartymemberConfirmManualDTO> page(Map<String, Object> params);
/**
* 默认查询
*
* @param params
* @return java.util.List<PartymemberConfirmManualDTO>
* @author generator
* @date 2020-03-30
*/
List<PartymemberConfirmManualDTO> list(Map<String, Object> params);
/**
* 默认查询
*
* @param params
* @return java.util.List<PartymemberConfirmManualDTO>
* @author generator
* @date 2020-03-30
*/
List<PartymemberConfirmManualDTO> list(Map<String, Object> params);
/**
* 单条查询
*
* @param id
* @return PartymemberConfirmManualDTO
* @author generator
* @date 2020-03-30
*/
PartymemberConfirmManualDTO get(String id);
/**
* 单条查询
*
* @param id
* @return PartymemberConfirmManualDTO
* @author generator
* @date 2020-03-30
*/
PartymemberConfirmManualDTO get(String id);
/**
* 默认保存
*
* @param dto
* @return void
* @author generator
* @date 2020-03-30
*/
void save(PartymemberConfirmManualDTO dto);
/**
* 默认保存
*
* @param dto
* @return void
* @author generator
* @date 2020-03-30
*/
void save(PartymemberConfirmManualDTO dto);
/**
* 默认更新
*
* @param dto
* @return void
* @author generator
* @date 2020-03-30
*/
void update(PartymemberConfirmManualDTO dto);
/**
* 默认更新
*
* @param dto
* @return void
* @author generator
* @date 2020-03-30
*/
void update(PartymemberConfirmManualDTO dto);
/**
* 批量删除
*
* @param ids
* @return void
* @author generator
* @date 2020-03-30
*/
void delete(String[] ids);
/**
* 批量删除
*
* @param ids
* @return void
* @author generator
* @date 2020-03-30
*/
void delete(String[] ids);
/**
* 单条查询
*
* @param partymemberInfoId
* @return
*/
PartymemberConfirmManualDTO getInfoByPartyMemberInfoId(String partymemberInfoId);
}

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

@ -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;
@ -81,8 +83,9 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
userResiInfoFormDTO.setUserId(fromDto.getUserId());
UserResiInfoResultDTO userResiInfoResult = epmetUserFeignClient.getUserResiInfoDTO(userResiInfoFormDTO).getData();
if (null != userResiInfoResult) {
PartymemberInfoDTO partyMemberInfo = ConvertUtils.sourceToTarget(userResiInfoResult,
PartymemberInfoDTO partyMemberInfo = ConvertUtils.sourceToTarget(userResiInfoResult,
PartymemberInfoDTO.class);
partyMemberInfo.setId("");
partyMemberInfo.setMobile(userResiInfoResult.getRegMobile());
partyMemberInfo.setEstate(userResiInfoResult.getDistrict());
partyMemberInfo.setBuilding(userResiInfoResult.getBuildingAddress());
@ -115,7 +118,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
//生成短信验证码
Map<String, String> message = (Map<String, String>) messageFeignClient.sendSmsCaptcha(fromDTO.getMobile()).getData();
if(null == message) {
if (null == message) {
result.setCode(EpmetErrorCode.MOBILE_GET_CODE_ERROR.getCode());
result.setMsg(EpmetErrorCode.MOBILE_GET_CODE_ERROR.getMsg());
return result;
@ -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");
partymemberInfoService.insert(partyMemberInfoEntity);
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");
partymemberInfoService.insert(partyMemberInfoEntity);
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());
partymemberConfirmAutoService.insert(ConvertUtils.sourceToTarget(confirmAutoDTO,
PartymemberConfirmAutoEntity.class));
if (null == partymemberConfirmAutoDTO) {
partymemberConfirmAutoService.insert(ConvertUtils.sourceToTarget(confirmAutoDTO,
PartymemberConfirmAutoEntity.class));
} else {
confirmAutoDTO.setId(partymemberConfirmAutoDTO.getId());
partymemberConfirmAutoService.updateById(ConvertUtils.sourceToTarget(confirmAutoDTO,
PartymemberConfirmAutoEntity.class));
}
}
//判断是否已注册居民，如果没有则注册居民
@ -209,15 +229,20 @@ 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());
manualEntity.setGridId(infoDTO.getGridId());
manualEntity.setUserId(infoDTO.getUserId());
manualEntity.setPartymemberInfoId(infoDTO.getId());
manualEntity.setAuditStatus(PartyMemberConstant.UNDER_AUDITTING);
partymemberConfirmManualService.insert(manualEntity);
}
//待审核数据存入党员认证人工审核表
PartymemberConfirmManualEntity manualEntity = new PartymemberConfirmManualEntity();
manualEntity.setCustomerId(infoDTO.getCustomerId());
manualEntity.setGridId(infoDTO.getGridId());
manualEntity.setUserId(infoDTO.getUserId());
manualEntity.setPartymemberInfoId(infoDTO.getId());
manualEntity.setAuditStatus(PartyMemberConstant.UNDER_AUDITTING);
partymemberConfirmManualService.insert(manualEntity);
return new Result();
}

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

@ -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();
double idCardResult = jw.similarity(baseInfo.getIdCard(), info.getIdCard());
double mobileResult = jw.similarity(baseInfo.getMobile(), info.getMobile());
double nameResult = jw.similarity(baseInfo.getName(), info.getSurname() + info.getName());
Levenshtein levenshtein = new Levenshtein();
double idCardResult = levenshtein.distance(baseInfo.getIdCard(), info.getIdCard());
double mobileResult = levenshtein.distance(baseInfo.getMobile(), info.getMobile());
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";

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

@ -38,8 +38,8 @@ import java.util.List;
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
@ -47,59 +47,67 @@ import java.util.Map;
@Service
public class PartymemberConfirmAutoServiceImpl extends BaseServiceImpl<PartymemberConfirmAutoDao, PartymemberConfirmAutoEntity> implements PartymemberConfirmAutoService {
@Autowired
private PartymemberConfirmAutoRedis partymemberConfirmAutoRedis;
@Override
public PageData<PartymemberConfirmAutoDTO> page(Map<String, Object> params) {
IPage<PartymemberConfirmAutoEntity> page = baseDao.selectPage(
getPage(params, FieldConstant.CREATED_TIME, false),
getWrapper(params)
);
return getPageData(page, PartymemberConfirmAutoDTO.class);
}
@Override
public List<PartymemberConfirmAutoDTO> list(Map<String, Object> params) {
List<PartymemberConfirmAutoEntity> entityList = baseDao.selectList(getWrapper(params));
return ConvertUtils.sourceToTarget(entityList, PartymemberConfirmAutoDTO.class);
}
private QueryWrapper<PartymemberConfirmAutoEntity> getWrapper(Map<String, Object> params){
String id = (String)params.get(FieldConstant.ID_HUMP);
QueryWrapper<PartymemberConfirmAutoEntity> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
return wrapper;
}
@Override
public PartymemberConfirmAutoDTO get(String id) {
PartymemberConfirmAutoEntity entity = baseDao.selectById(id);
return ConvertUtils.sourceToTarget(entity, PartymemberConfirmAutoDTO.class);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void save(PartymemberConfirmAutoDTO dto) {
PartymemberConfirmAutoEntity entity = ConvertUtils.sourceToTarget(dto, PartymemberConfirmAutoEntity.class);
insert(entity);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void update(PartymemberConfirmAutoDTO dto) {
PartymemberConfirmAutoEntity entity = ConvertUtils.sourceToTarget(dto, PartymemberConfirmAutoEntity.class);
updateById(entity);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void delete(String[] ids) {
// 逻辑删除（@TableLogic 注解）
baseDao.deleteBatchIds(Arrays.asList(ids));
}
@Autowired
private PartymemberConfirmAutoRedis partymemberConfirmAutoRedis;
@Override
public PageData<PartymemberConfirmAutoDTO> page(Map<String, Object> params) {
IPage<PartymemberConfirmAutoEntity> page = baseDao.selectPage(
getPage(params, FieldConstant.CREATED_TIME, false),
getWrapper(params)
);
return getPageData(page, PartymemberConfirmAutoDTO.class);
}
@Override
public List<PartymemberConfirmAutoDTO> list(Map<String, Object> params) {
List<PartymemberConfirmAutoEntity> entityList = baseDao.selectList(getWrapper(params));
return ConvertUtils.sourceToTarget(entityList, PartymemberConfirmAutoDTO.class);
}
private QueryWrapper<PartymemberConfirmAutoEntity> getWrapper(Map<String, Object> params) {
String id = (String) params.get(FieldConstant.ID_HUMP);
QueryWrapper<PartymemberConfirmAutoEntity> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
return wrapper;
}
@Override
public PartymemberConfirmAutoDTO get(String id) {
PartymemberConfirmAutoEntity entity = baseDao.selectById(id);
return ConvertUtils.sourceToTarget(entity, PartymemberConfirmAutoDTO.class);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void save(PartymemberConfirmAutoDTO dto) {
PartymemberConfirmAutoEntity entity = ConvertUtils.sourceToTarget(dto, PartymemberConfirmAutoEntity.class);
insert(entity);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void update(PartymemberConfirmAutoDTO dto) {
PartymemberConfirmAutoEntity entity = ConvertUtils.sourceToTarget(dto, PartymemberConfirmAutoEntity.class);
updateById(entity);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void delete(String[] ids) {
// 逻辑删除（@TableLogic 注解）
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);
}
}

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

@ -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);
}
}

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

@ -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}
AND GRID_ID = #{gridId}
AND USER_ID = #{userId}
AND DEL_FLAG = 0
pi.CUSTOMER_ID = #{customerId}
AND pi.GRID_ID = #{gridId}
AND pi.USER_ID = #{userId}
AND pi.DEL_FLAG = 0
AND pcm.AUDIT_STATUS = 'under_auditting'
</select>
<select id="selectPartyMemberInfoByMobile"
parameterType="com.epmet.modules.partymember.entity.PartymemberInfoEntity"

Write Preview
Loading…
Cancel
Save