From ce22f2e27f49f8f6e9d3b7d4832b093d500094a4 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 12 Nov 2021 09:39:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=91=E9=83=BD=E6=94=B9=E5=A4=9F=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/BuildingServiceImpl.java | 6 +++++- .../main/java/com/epmet/service/impl/HouseServiceImpl.java | 6 +++++- .../com/epmet/service/impl/NeighborHoodServiceImpl.java | 6 +++++- 3 files changed, 15 insertions(+), 3 deletions(-) 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 b7c75a08e1..b0241965a8 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 @@ -245,7 +245,9 @@ public class BuildingServiceImpl implements BuildingService { //封装数据 List buildingEntityList = new ArrayList<>(); List icBuildingUnitEntityList = new ArrayList<>(); - for (IcBuildingExcel icBuildingExcel : list) { + Iterator iterator1 = list.iterator(); + while (iterator1.hasNext()) { + IcBuildingExcel icBuildingExcel = iterator1.next(); IcBuildingEntity entity = new IcBuildingEntity(); String uuid = UUID.randomUUID().toString().replace("-", ""); entity.setId(uuid); @@ -254,6 +256,7 @@ public class BuildingServiceImpl implements BuildingService { if ("".equals(entity.getNeighborHoodId())) { //str.append("".equals(str) ? icBuildingExcel.getNeighborHoodName() : str.append("、").append(icBuildingExcel.getNeighborHoodName())); numList.add(icBuildingExcel.getRowNum()); + iterator1.remove(); continue; } entity.setBuildingName(icBuildingExcel.getBuildingName()); @@ -281,6 +284,7 @@ public class BuildingServiceImpl implements BuildingService { //throw new RenException(EpmetErrorCode.BUILDING_NAME_EXITED.getCode(),EpmetErrorCode.BUILDING_NAME_EXITED.getMsg()); log.error(EpmetErrorCode.BUILDING_NAME_EXITED.getMsg()); numList.add(icBuildingExcel.getRowNum()); + iterator1.remove(); continue; } icBuildingUnitEntityList.addAll(unitList); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index cbdf569234..4ff3bb2948 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java @@ -161,7 +161,9 @@ public class HouseServiceImpl implements HouseService { }); //封装数据 List houseEntityList = new ArrayList<>(); - for (IcHouseExcel icHouseExcel : list) { + Iterator iterator1 = list.iterator(); + while (iterator1.hasNext()) { + IcHouseExcel icHouseExcel = iterator1.next(); IcHouseEntity entity = new IcHouseEntity(); String uuid = UUID.randomUUID().toString().replace("-", ""); entity.setId(uuid); @@ -175,6 +177,7 @@ public class HouseServiceImpl implements HouseService { if ("".equals(entity.getNeighborHoodId()) || "".equals(entity.getBuildingId()) || "".equals(entity.getBuildingUnitId())) { //str.append("".equals(str) ? icHouseExcel.getBuildingName() + icHouseExcel.getBuildingUnit() : str.append("、").append(icHouseExcel.getBuildingName() + icHouseExcel.getBuildingUnit())); numList.add(icHouseExcel.getRowNum()); + iterator1.remove(); continue; } entity.setDoorName(icHouseExcel.getDoorName()); @@ -190,6 +193,7 @@ public class HouseServiceImpl implements HouseService { //throw new RenException(EpmetErrorCode.DOOR_NAME_EXITED.getCode(), EpmetErrorCode.DOOR_NAME_EXITED.getMsg()); log.error(EpmetErrorCode.DOOR_NAME_EXITED.getMsg()); numList.add(icHouseExcel.getRowNum()); + iterator1.remove(); continue; } houseEntityList.add(entity); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java index e43b2e2045..dd5e742342 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java @@ -294,13 +294,16 @@ public class NeighborHoodServiceImpl implements NeighborHoodService { //封装数据 List neighborHoodEntityList = new ArrayList<>(); List icNeighborHoodPropertyEntityList = new ArrayList<>(); - for (IcNeighborHoodExcel icNeighborHoodExcel : list) { + Iterator iterator1 = list.iterator(); + while (iterator1.hasNext()) { + IcNeighborHoodExcel icNeighborHoodExcel = iterator1.next(); //同一客户下，小区名称唯一 Integer count = icNeighborHoodDao.checkNameUq(customerId,icNeighborHoodExcel.getNeighborHoodName(),null); if (null != count && count > 0) { //throw new RenException(EpmetErrorCode.NEIGHBOOR_NAME_EXITED.getCode(), icNeighborHoodExcel.getNeighborHoodName()+EpmetErrorCode.NEIGHBOOR_NAME_EXITED.getMsg()); log.error(icNeighborHoodExcel.getNeighborHoodName()+EpmetErrorCode.NEIGHBOOR_NAME_EXITED.getMsg()); numList.add(icNeighborHoodExcel.getRowNum()); + iterator1.remove(); continue; } @@ -317,6 +320,7 @@ public class NeighborHoodServiceImpl implements NeighborHoodService { //网格名对应不上的数据舍弃 if ("".equals(entity.getGridId())) { numList.add(icNeighborHoodExcel.getRowNum()); + iterator1.remove(); continue; } entity.setAddress(icNeighborHoodExcel.getAddress());