From a3d9a8a48375a079054a54791f3ea9077b2a5fa6 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 13 Oct 2022 11:11:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AD=BB=E4=BA=A1=E6=AD=BB=E4=BA=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/DataSyncRecordDeathDTO.java | 9 +- .../dto/DataSyncRecordDisabilityDTO.java | 2 +- .../com/epmet/dto/form/DataSyncTaskParam.java | 4 - .../entity/DataSyncRecordDeathEntity.java | 9 +- .../DataSyncRecordDisabilityEntity.java | 2 +- .../service/DataSyncRecordDeathService.java | 5 +- .../impl/DataSyncConfigServiceImpl.java | 157 ++++++++++-------- .../impl/DataSyncRecordDeathServiceImpl.java | 7 + .../resources/mapper/DataSyncConfigDao.xml | 3 - .../mapper/DataSyncRecordDeathDao.xml | 5 +- .../mapper/DataSyncRecordDisabilityDao.xml | 3 +- 11 files changed, 111 insertions(+), 95 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordDeathDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordDeathDTO.java index 33ad3a8c5f..ee9bac3c01 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordDeathDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordDeathDTO.java @@ -52,11 +52,6 @@ public class DataSyncRecordDeathDTO implements Serializable { */ private String idCard; - /** - * 手机号 - */ - private String mobile; - /** * 居民Id，ic_resi_user.id */ @@ -65,7 +60,7 @@ public class DataSyncRecordDeathDTO implements Serializable { /** * 年龄(享年) */ - private Integer age; + private String age; /** * 家庭住址 @@ -110,7 +105,7 @@ public class DataSyncRecordDeathDTO implements Serializable { /** * 处理结果 */ - private String dealRedult; + private String dealResult; /** * 删除标识：0.未删除 1.已删除 diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordDisabilityDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordDisabilityDTO.java index 678a770c1a..8c99d8f95b 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordDisabilityDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordDisabilityDTO.java @@ -110,7 +110,7 @@ public class DataSyncRecordDisabilityDTO implements Serializable { /** * 处理结果 */ - private String dealRedult; + private String dealResult; /** * 删除标识：0.未删除 1.已删除 diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DataSyncTaskParam.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DataSyncTaskParam.java index 163158f47e..563bfc1500 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DataSyncTaskParam.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DataSyncTaskParam.java @@ -30,10 +30,6 @@ public class DataSyncTaskParam implements Serializable { * 居民状态【0:正常;1:迁出;2:注销】 */ private String resiStatus; - /** - * 居民子状态 01：新增、02：导入、03：迁入、04：新生、11：迁出、21死亡 - */ - private String resiSubStatus; /** * 类别字段 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/DataSyncRecordDeathEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/DataSyncRecordDeathEntity.java index 49d8749e9a..9525bd45a7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/DataSyncRecordDeathEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/DataSyncRecordDeathEntity.java @@ -48,11 +48,6 @@ public class DataSyncRecordDeathEntity extends BaseEpmetEntity { */ private String idCard; - /** - * 手机号 - */ - private String mobile; - /** * 居民Id，ic_resi_user.id */ @@ -61,7 +56,7 @@ public class DataSyncRecordDeathEntity extends BaseEpmetEntity { /** * 年龄(享年) */ - private Integer age; + private String age; /** * 家庭住址 @@ -106,6 +101,6 @@ public class DataSyncRecordDeathEntity extends BaseEpmetEntity { /** * 处理结果 */ - private String dealRedult; + private String dealResult; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/DataSyncRecordDisabilityEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/DataSyncRecordDisabilityEntity.java index 4307bd8e25..50dc64edbe 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/DataSyncRecordDisabilityEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/DataSyncRecordDisabilityEntity.java @@ -106,6 +106,6 @@ public class DataSyncRecordDisabilityEntity extends BaseEpmetEntity { /** * 处理结果 */ - private String dealRedult; + private String dealResult; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncRecordDeathService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncRecordDeathService.java index 17a4efb3e0..1a2ad35e82 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncRecordDeathService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncRecordDeathService.java @@ -1,5 +1,6 @@ package com.epmet.service; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.DataSyncRecordDeathDTO; @@ -75,4 +76,6 @@ public interface DataSyncRecordDeathService extends BaseService queryWrapper); +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java index 26fe7c97c3..e89d012f1b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java @@ -11,7 +11,6 @@ import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.form.PageFormDTO; import com.epmet.commons.tools.dto.result.YtDataSyncResDTO; import com.epmet.commons.tools.dto.result.YtHsjcResDTO; -import com.epmet.commons.tools.enums.IcResiUserSubStatusEnum; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.CustomerOrgRedis; @@ -24,6 +23,7 @@ import com.epmet.commons.tools.utils.YtHsResUtils; import com.epmet.dao.DataSyncConfigDao; import com.epmet.dao.IcNatDao; import com.epmet.dto.DataSyncConfigDTO; +import com.epmet.dto.DataSyncRecordDeathDTO; import com.epmet.dto.DataSyncRecordDisabilityDTO; import com.epmet.dto.form.ConfigSwitchFormDTO; import com.epmet.dto.form.DataSyncTaskParam; @@ -216,20 +216,22 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl dbResiList) { - List list = new ArrayList<>(); + List list = new ArrayList<>(); for (NatUserInfoResultDTO dbResi : dbResiList) { YtDataSyncResDTO thirdResult = YtHsResUtils.siWang(dbResi.getIdCard(), dbResi.getName()); if (200 != thirdResult.getCode()) { @@ -271,74 +273,50 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(DataSyncRecordDisabilityEntity::getIdCard, dbResi.getIdCard()); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(DataSyncRecordDeathEntity::getIdCard, dbResi.getIdCard()); //获取数据库里的记录 - DataSyncRecordDisabilityDTO dbDisablityEntity = dataSyncRecordDisabilityService.selectOne(queryWrapper); + DataSyncRecordDeathDTO dbDeathEntity = dataSyncRecordDeathService.selectOne(queryWrapper); - DataSyncRecordDisabilityEntity entity = new DataSyncRecordDisabilityEntity(); - entity.setId(dbDisablityEntity.getId()); - //居民库里 是否是残疾 - String categoryColumn = dbResi.getCategoryColumn(); - JudgeDealStatus judgeDealStatus = null; - //居民是残疾 - if (NumConstant.ONE_STR.equals(categoryColumn)) { - // 第三方返回了该人的 残疾记录 说明和居民库的状态一致 只需要处理 同步记录中的数据即可 - if (thirdResultObject != null) { - //todo 联调时看一下 为什么db == null 总是true - judgeDealStatus = new JudgeDealStatus(dbDisablityEntity).invoke(); - if (judgeDealStatus.isStop()) { - continue; - } - } else { - //没有返回该人是残疾的数据 说明需要处理居民库的数据 - judgeDealStatus = new JudgeDealStatus(dbDisablityEntity).notSame(); - } - } else if (NumConstant.ZERO_STR.equals(categoryColumn)) { - //居民不是残疾 - - // 第三方没有返回了该人的 残疾记录 说明和居民库的状态一致 只需要处理 同步记录中的数据即可 - if (thirdResultObject == null) { - //todo 联调时看一下 为什么db == null 总是true - judgeDealStatus = new JudgeDealStatus(dbDisablityEntity).invoke(); - if (judgeDealStatus.isStop()) { - continue; - } - } else { - //蓝图返回该人是残疾的数据 说明需要处理居民库的数据 - judgeDealStatus = new JudgeDealStatus(dbDisablityEntity).notSame(); - } + JudgeDealStatus judgeDealStatus= new JudgeDealStatus(thirdResultObject,dbDeathEntity).invokeDeath(); + if (judgeDealStatus.isStop()) { + continue; } + DataSyncRecordDeathEntity entity = new DataSyncRecordDeathEntity(); + entity.setId(dbDeathEntity.getId()); entity.setCustomerId(dbResi.getCustomerId()); entity.setAgencyId(dbResi.getAgencyId()); entity.setPids(dbResi.getPids()); entity.setGridId(dbResi.getGridId()); entity.setName(dbResi.getName()); - entity.setIdCard(thirdResultObject.getString("citizenId")); - entity.setMobile(thirdResultObject.getString("phoneNo")); + entity.setIdCard(dbResi.getIdCard()); entity.setIcResiUserId(dbResi.getUserId()); - entity.setCardNum(thirdResultObject.getString("cardNum")); - //todo 残疾等级 从字典获取 - entity.setCjzk(thirdResultObject.getString("idtLevelName")); - entity.setCjlb(thirdResultObject.getString("idtKindName")); - entity.setEduLevel(thirdResultObject.getString("eduLevelName")); - entity.setMaritalStatus(thirdResultObject.getString("marriagerName")); - entity.setGuardian(thirdResultObject.getString("guardian")); - entity.setGuardianPhone(thirdResultObject.getString("guardianPhone")); + + entity.setAge(thirdResultObject.getString("AGE")); + entity.setAddress(thirdResultObject.getString("FAMILY_ADD")); + entity.setDeathDate(thirdResultObject.getString("DEATH_DATE")); + entity.setCremationTime(thirdResultObject.getString("CREMATION_TIME")); + entity.setMz(thirdResultObject.getString("FAMILY_ADD")); + entity.setOrganName(thirdResultObject.getString("CREATE_ORGAN_NAME")); + entity.setNation(thirdResultObject.getString("NATION")); + entity.setThirdRecordId(thirdResultObject.getString("RECORD_ID")); entity.setDealStatus(NumConstant.ZERO); - entity.setDealRedult(StrConstant.EPMETY_STR); + entity.setDealResult(StrConstant.EPMETY_STR); if (judgeDealStatus.isNeedSetStatus) { - entity.setDealRedult(judgeDealStatus.dealResult); + entity.setDealResult(judgeDealStatus.dealResult); entity.setDealStatus(judgeDealStatus.dealStatus); } list.add(entity); } - dataSyncRecordDisabilityService.saveOrUpdateBatch(list); + if (list.size()==NumConstant.ZERO){ + return; + } + dataSyncRecordDeathService.saveOrUpdateBatch(list,NumConstant.TWO_HUNDRED); } /** @@ -350,14 +328,14 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl getNatUserInfoFromDB(DataSyncTaskParam formDTO, DataSyncEnum anEnum, int pageNo, int pageSize) { + private List getNatUserInfoFromDb(DataSyncTaskParam formDTO, DataSyncEnum anEnum, int pageNo, int pageSize) { //根据 组织 分页获取 居民数据 PageInfo pageInfo = PageHelper.startPage(pageNo, pageSize, false) .doSelectPageInfo(() -> baseDao.getIdCardsByScope(formDTO)); List dbResiList; dbResiList = pageInfo.getList(); //如果传了身份证号 则按照身份证号查询 并同步记录， userId如果为空则是 手动录入的 此人没有录入居民库 但是也可以同步 - if (CollectionUtils.isNotEmpty(formDTO.getIdCards()) && DataSyncEnum.HE_SUAN.equals(anEnum.getCode())) { + if (CollectionUtils.isNotEmpty(formDTO.getIdCards()) && DataSyncEnum.HE_SUAN.getCode().equals(anEnum.getCode())) { List collect = formDTO.getIdCards().stream().map(id -> { NatUserInfoResultDTO e = new NatUserInfoResultDTO(); e.setIdCard(id); @@ -412,7 +390,7 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl queryWrapper) { + DataSyncRecordDeathEntity entity = baseDao.selectOne(queryWrapper); + return ConvertUtils.sourceToTarget(entity, DataSyncRecordDeathDTO.class); + } + } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncConfigDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncConfigDao.xml index bae3918241..426506f447 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncConfigDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncConfigDao.xml @@ -78,9 +78,6 @@ '0' - - AND SUB_STATUS = #{resiSubStatus} - AND id_card in diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordDeathDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordDeathDao.xml index 62ec7629fa..512911058f 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordDeathDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordDeathDao.xml @@ -11,7 +11,6 @@ - @@ -22,7 +21,7 @@ - + @@ -32,4 +31,4 @@ - \ No newline at end of file + diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordDisabilityDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordDisabilityDao.xml index 332b0734cc..a08fdfc710 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordDisabilityDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordDisabilityDao.xml @@ -22,7 +22,8 @@ - + +