From 663f146cddb30aa2796f82c570638f060b4b416e Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 2 Sep 2022 14:50:13 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF=E5=85=9A?= =?UTF-8?q?=E5=91=98=E4=BF=A1=E6=81=AF=E8=AE=A4=E8=AF=81=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E6=97=B6=20=E8=87=AA=E5=8A=A8=E6=A0=A1=E9=AA=8C=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E5=8E=BB=E6=95=B0=E5=AD=97=E5=B9=B3=E5=8F=B0=E5=85=9A?= =?UTF-8?q?=E5=91=98=E5=BA=93=E6=9F=A5=E8=AF=A2=E4=B8=94=E5=8F=AA=E6=8C=89?= =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=8F=B7=E6=A0=A1=E9=AA=8C=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=85=9A=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PartyMemberConfirmServiceImpl.java | 32 +++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) 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 961197076d..a980778c64 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 @@ -1,6 +1,7 @@ package com.epmet.modules.partymember.service.impl; import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.EpmetRoleKeyConstant; import com.epmet.commons.tools.constant.NumConstant; @@ -21,6 +22,7 @@ import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.modules.feign.EpmetUserFeignClient; import com.epmet.modules.feign.GovOrgFeignClient; import com.epmet.modules.feign.ResiGroupFeignClient; +import com.epmet.modules.partymember.dao.IcPartyMemberDao; import com.epmet.modules.partymember.entity.*; import com.epmet.modules.partymember.redis.PartymemberInfoRedis; import com.epmet.modules.partymember.service.*; @@ -86,6 +88,8 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService private PartymemberAuthRecordService partymemberAuthRecordService; @Autowired private EpmetUserOpenFeignClient epmetUserOpenFeignClient; + @Autowired + private IcPartyMemberDao icPartyMemberDao; @Override @Transactional(rollbackFor = Exception.class) @@ -191,8 +195,8 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService } //获取党员基本信息(匹配) - PartymemberConfirmAutoDTO confirmAutoDTO = - partymemberBaseInfoService.getPartyMemberBaseInfo(partyMemberInfoDTO); + //PartymemberConfirmAutoDTO confirmAutoDTO = partymemberBaseInfoService.getPartyMemberBaseInfo(partyMemberInfoDTO); + PartymemberConfirmAutoDTO confirmAutoDTO = partyAuth(partyMemberInfoDTO); //判断是否已注册居民，如果没有则注册居民 isResiRegister(partyMemberInfoDTO); @@ -294,6 +298,30 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService return result; } + /** + * 居民点党员提交认证校验逻辑调整改查数字平台党员信息库， + * 切只按身份证号查询 + */ + public PartymemberConfirmAutoDTO partyAuth(PartymemberInfoDTO dto) { + PartymemberConfirmAutoDTO resultDTO = new PartymemberConfirmAutoDTO(); + if (StringUtils.isBlank(dto.getIdCard())) { + resultDTO.setComparisonResults(false); + return resultDTO; + } + LambdaQueryWrapper tWrapper = new LambdaQueryWrapper<>(); + tWrapper.eq(IcPartyMemberEntity::getCustomerId, dto.getCustomerId()); + tWrapper.eq(IcPartyMemberEntity::getIdCard, dto.getIdCard()); + tWrapper.last("limit 1"); + IcPartyMemberEntity entity = icPartyMemberDao.selectOne(tWrapper); + if (null == entity) { + resultDTO.setComparisonResults(false); + return resultDTO; + } + resultDTO.setComparisonResults(true); + resultDTO.setPatryMemberBaseInfoId(entity.getId()); + return resultDTO; + } + @Override @Transactional(rollbackFor = Exception.class) public Result partyMemberInfoExtra(PartymemberInfoDTO infoDTO) { From 3e140df253f864f9b302ff102b088f0997bc3f60 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 2 Sep 2022 15:08:06 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=90=8C=E4=B8=80=E5=B0=8F=E5=8C=BA?= =?UTF-8?q?=E4=B8=8B=E6=A5=BC=E6=A0=8B=E4=B8=8D=E9=87=8D=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/exception/EpmetErrorCode.java | 1 + .../constant/ImportErrorMsgConstants.java | 1 + .../java/com/epmet/dao/IcBuildingDao.java | 9 +++++ .../model/ImportBuildingInfoListener.java | 6 ++++ .../epmet/model/ImportHouseInfoListener.java | 8 ++++- .../service/impl/BuildingServiceImpl.java | 11 ++++++ .../main/resources/mapper/IcBuildingDao.xml | 35 +++++++++++++++++++ 7 files changed, 70 insertions(+), 1 deletion(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index 163dee5e2f..405d84d4ae 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java @@ -85,6 +85,7 @@ public enum EpmetErrorCode { BUILDING_NAME_EXITED(8215,"楼栋名称已存在"), DOOR_NAME_EXITED(8216,"门牌号已存在"), NEIGHBOOR_NAME_EXITED(8217,"小区名称已存在"), + BUILDING_NAME_EXITED_IN_GRID(8218,"小区下该楼栋已存在于其他网格"), REQUIRE_PERMISSION(8301, "您没有足够的操作权限"), THIRD_PLAT_REQUEST_ERROR(8302, "请求第三方平台错误"), diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/ImportErrorMsgConstants.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/ImportErrorMsgConstants.java index 85f0d846f7..50d0b7931c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/ImportErrorMsgConstants.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/ImportErrorMsgConstants.java @@ -25,5 +25,6 @@ public interface ImportErrorMsgConstants { String HOUSE_ERROR_NAME = "导入失败的列表-房屋"; String BUILDING_ERROR_NAME = "导入失败的列表-楼栋"; String NEIGHBORHOOD_ERROR_NAME = "导入失败的列表-小区"; + String BUILDING_NAME_EXITED_IN_GRID = "小区下该楼栋已存在于其他网格"; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java index 4e963af722..46f0041e8d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java @@ -67,6 +67,15 @@ public interface IcBuildingDao extends BaseDao { List baseInfoFamilyBuilding(@Param("neighborHoodId")String neighborHoodId); Integer checkBuildName(@Param("neighborHoodId") String neighborHoodId,@Param("buildingName")String buildingName, @Param("buildingId")String buildingId); + Integer checkBuildNameV2(@Param("agencyId") String agencyId, + @Param("neighborHoodName") String neighborHoodName, + @Param("buildingName")String buildingName, + @Param("buildingId")String buildingId); + Integer checkBuildNameV3(@Param("agencyId") String agencyId, + @Param("gridId") String gridId, + @Param("neighborHoodName") String neighborHoodName, + @Param("buildingName")String buildingName, + @Param("buildingId")String buildingId); List buildingListByIds(@Param("buildingIdList") List buildingIdList); IPage buildingListByIds(IPage page,@Param("buildingIdList") List buildingIdList); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java index e567bf017d..79009b1039 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java @@ -210,6 +210,12 @@ public class ImportBuildingInfoListener extends AnalysisEventListener 0){ + // 说明数据库已存在此楼栋，不需添加 + nums.add(num); + disposeErrorMsg(info,ImportErrorMsgConstants.BUILDING_NAME_EXITED_IN_GRID); + } if (orgType.equals(CustomerGridConstant.GRID) || orgType.equals(CustomerGridConstant.AGENCY)){ List gridIds = new ArrayList<>(); if (orgType.equals(CustomerGridConstant.GRID)){ diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java index 812792b964..194f39eb54 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java @@ -3,12 +3,12 @@ package com.epmet.model; import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.event.AnalysisEventListener; import com.epmet.commons.tools.constant.NumConstant; -import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; import com.epmet.commons.tools.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.constant.CustomerGridConstant; +import com.epmet.constant.ImportErrorMsgConstants; import com.epmet.constants.ImportTaskConstants; import com.epmet.dao.IcBuildingDao; import com.epmet.dto.IcHouseDTO; @@ -489,6 +489,12 @@ public class ImportHouseInfoListener extends AnalysisEventListener 0){ + // 说明数据库已存在此楼栋，不需添加 + nums.add(num); + disposeErrorMsg(info, ImportErrorMsgConstants.BUILDING_NAME_EXITED_IN_GRID); + } if (orgType.equals(CustomerGridConstant.GRID) || orgType.equals(CustomerGridConstant.AGENCY)){ List gridIds = new ArrayList<>(); if (orgType.equals(CustomerGridConstant.GRID)){ diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java index 86e54b4356..36dde00dfe 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java @@ -102,9 +102,15 @@ public class BuildingServiceImpl implements BuildingService { public void addBuilding(String customerId, IcBulidingAddFormDTO formDTO) { //同一小区下不能存在楼栋名字一样的 Integer count = icBuildingDao.checkBuildName(formDTO.getNeighborHoodId(), formDTO.getBuildingName(), null); + if (null != count && count > 0) { throw new RenException(EpmetErrorCode.BUILDING_NAME_EXITED.getCode(), EpmetErrorCode.BUILDING_NAME_EXITED.getMsg()); } + IcNeighborHoodEntity neighborHood = icNeighborHoodDao.selectById(formDTO.getNeighborHoodId()); + count = icBuildingDao.checkBuildNameV2(formDTO.getAgencyId(), neighborHood.getNeighborHoodName(), formDTO.getBuildingName(), null); + if (null != count && count > 0) { + throw new EpmetException(EpmetErrorCode.BUILDING_NAME_EXITED_IN_GRID.getCode()); + } //楼栋编码不可重复 if(org.apache.commons.lang3.StringUtils.isNotBlank(formDTO.getCoding())){ IcBuildingEntity isHaveCoding = icBuildingDao.selectByCoding(formDTO.getCoding(),null); @@ -475,6 +481,11 @@ public class BuildingServiceImpl implements BuildingService { if (null != count && count > 0) { throw new RenException(EpmetErrorCode.BUILDING_NAME_EXITED.getCode(), EpmetErrorCode.BUILDING_NAME_EXITED.getMsg()); } + IcNeighborHoodEntity neighborHood = icNeighborHoodDao.selectById(formDTO.getNeighborHoodId()); + count = icBuildingDao.checkBuildNameV2(formDTO.getAgencyId(), neighborHood.getNeighborHoodName(), formDTO.getBuildingName(), formDTO.getBuildingId()); + if (null != count && count > 0) { + throw new EpmetException(EpmetErrorCode.BUILDING_NAME_EXITED_IN_GRID.getCode()); + } IcBuildingDTO icBuilding = icBuildingService.get(formDTO.getBuildingId()); if (!icBuilding.getNeighborHoodId().equals(formDTO.getNeighborHoodId())) { //更新对应房屋小区id diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml index 8e6b5dd039..1512e7b23e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml @@ -247,6 +247,41 @@ + + + +