From 23fecfa3a66a74cae424fef0509fb822f1d5edc4 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 15 Apr 2022 10:56:51 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=85=B7=E4=BD=93=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../constant/ImportErrorMsgConstants.java     | 14 ++++----
 .../model/ImportBuildingInfoListener.java     | 28 ++++++++--------
 .../epmet/model/ImportHouseInfoListener.java  | 32 ++++++++++---------
 .../model/ImportNeighborHoodInfoListener.java | 22 ++++++-------
 4 files changed, 51 insertions(+), 45 deletions(-)

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 be68d37843..ff66dcb167 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
@@ -9,14 +9,16 @@ public interface ImportErrorMsgConstants {
 
     String EXIST_ERROR = "数据已存在";
 
-    String HOUSE_ERROR = "所属组织、所属网格、所属小区、所属楼栋、单元号、房屋类型、房屋用途、出租的值未填写，或者所填写信息在系统中未找到";
+    String DOCUMENT_EXIST_ERROR = "文件中存在重复数据";
 
-    String BUILDING_ERROR = "所属组织、所属网格、所属小区、楼栋类型、单元数的值未填写，或者所填写信息在系统中未找到";
+    String BELONG_GRID_ERROR = "所属网格的值未填写或者所填写信息在系统中未找到";
 
-    String NEIGHBOR_HOOD_ERROR = "所属组织、所属网格、详细地址的值未填写，或者所填写信息在系统中未找到";
+    String BELONG_AGENCY_ERROR = "所属组织的值未填写或者所填写信息在系统中未找到";
 
-    String HOUSE_ERROR_NAME = "导入失败的列表-房屋";
-    String BUILDING_ERROR_NAME = "导入失败的列表-楼宇";
-    String NEIGHBORHOOD_ERROR_NAME = "导入失败的列表-小区";
+    String HOUSE_TYPE_ERROR = "房屋类型的值未填写或者所填写信息在系统中未找到";
+
+    String BUILDING_TYPE_ERROR = "楼栋类型的值未填写或者所填写信息在系统中未找到";
+
+    String NEIGHBORHOOD_TYPE_ERROR = "小区名称的值未填写或者所填写信息在系统中未找到";
 
 }
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 7451f1f996..47681e15d1 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
@@ -30,6 +30,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import static com.epmet.constant.ImportErrorMsgConstants.*;
+
 /**
  * @Author zxc
  * @DateTime 2022/2/15 10:06 上午
@@ -117,7 +119,7 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
         // 应产品要求添加
         if (StringUtils.isNotBlank(dto.getType()) && (!dto.getType().equals("商品房") && !dto.getType().equals("自建房")) && !dto.getType().equals("别墅")){
             nums.add(num);
-            disposeErrorMsg(info, ImportErrorMsgConstants.BUILDING_ERROR);
+            disposeErrorMsg(info, BUILDING_TYPE_ERROR);
             return;
         }
         dto.setType(BuildingTypeEnums.getKeyByValue(dto.getType()));
@@ -150,7 +152,7 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
                             // 集合里重复的
                             nums.add(r.getNum());
                             BuildingInfoModel buildingInfoModel = ConvertUtils.sourceToTarget(r, BuildingInfoModel.class);
-                            disposeErrorMsg(buildingInfoModel,ImportErrorMsgConstants.EXIST_ERROR);
+                            disposeErrorMsg(buildingInfoModel,DOCUMENT_EXIST_ERROR);
                             r.setExistStatus(true);
                             r.setAddStatus(true);
                         }
@@ -231,19 +233,19 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
         //排除不是本小区的
         if (!dto.getNeighborHoodName().equals(neighborHoodGeneralDTO.getNeighborHoodName())){
             nums.add(num);
-            disposeErrorMsg(info,ImportErrorMsgConstants.BUILDING_ERROR);
+            disposeErrorMsg(info,"所属小区的值未填写或者所填写信息在系统中未找到");
         }else {
             GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(neighborHoodGeneralDTO.getGridId());
             if (null == gridInfo){
                 nums.add(num);
-                disposeErrorMsg(info, ImportErrorMsgConstants.BUILDING_ERROR);
+                disposeErrorMsg(info, BELONG_GRID_ERROR);
                 return;
             }
             // 1.排除网格名不一样但小区名一样 2.排除组织不一样，网格一样，小区一样
             if ((!gridInfo.getGridName().equals(dto.getGridName()) && neighborHoodGeneralDTO.getNeighborHoodName().equals(dto.getNeighborHoodName())) ||
                     (!gridInfo.getAgencyName().equals(dto.getAgencyName()) && gridInfo.getGridName().equals(dto.getGridName()) && neighborHoodGeneralDTO.getNeighborHoodName().equals(dto.getNeighborHoodName()))){
                 nums.add(num);
-                disposeErrorMsg(info,ImportErrorMsgConstants.BUILDING_ERROR);
+                disposeErrorMsg(info,BELONG_GRID_ERROR);
                 return;
             }
             dto.setNeighborHoodId(formDTO.getOrgId());
@@ -252,7 +254,7 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
             AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(dto.getAgencyId());
             if (null == agencyInfo){
                 nums.add(num);
-                disposeErrorMsg(info, ImportErrorMsgConstants.BUILDING_ERROR);
+                disposeErrorMsg(info, BELONG_AGENCY_ERROR);
                 return;
             }
             dto.setPid(agencyInfo.getPid());
@@ -273,13 +275,13 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
         GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(formDTO.getOrgId());
         if (null == gridInfo){
             nums.add(num);
-            disposeErrorMsg(info, ImportErrorMsgConstants.BUILDING_ERROR);
+            disposeErrorMsg(info, BELONG_GRID_ERROR);
             return;
         }
         //排除不是本网格的 gridName不一样排除，gridName一样但是agencyName不一样也得排除
         if (dto.getGridName().compareTo(gridName) != 0 || (!dto.getAgencyName().equals(gridInfo.getAgencyName()) && dto.getGridName().equals(gridName))){
             nums.add(num);
-            disposeErrorMsg(info,ImportErrorMsgConstants.BUILDING_ERROR);
+            disposeErrorMsg(info,BELONG_GRID_ERROR);
         }else {
             //
             dto.setGridId(formDTO.getOrgId());
@@ -287,7 +289,7 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
             AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(dto.getAgencyId());
             if (null == agencyInfo){
                 nums.add(num);
-                disposeErrorMsg(info, ImportErrorMsgConstants.BUILDING_ERROR);
+                disposeErrorMsg(info, BELONG_AGENCY_ERROR);
                 return;
             }
             dto.setPid(agencyInfo.getPid());
@@ -308,21 +310,21 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
         //排除不是本组织的
         if (!dto.getAgencyName().equals(agencyName)){
             nums.add(num);
-            disposeErrorMsg(info,ImportErrorMsgConstants.BUILDING_ERROR);
+            disposeErrorMsg(info,BELONG_AGENCY_ERROR);
         }else {
             // 根据组织查询出所有网格，甩出不是本组织下的网格
             gridInfos = null == gridInfos ? getGridInfos(formDTO.getOrgId()) : gridInfos;
             if (null == gridInfos){
                 // 组织下确实不存在网格
                 nums.add(num);
-                disposeErrorMsg(info,ImportErrorMsgConstants.BUILDING_ERROR);
+                disposeErrorMsg(info,BELONG_GRID_ERROR);
                 return;
             }
             // 根据网格名对比，没有找到的就把行号加入到未执行成功队列中
             Object cacheGridName = icHouseRedis.getTemporaryCacheGrid(formDTO.getCustomerId(), formDTO.getUserId(), dto.getGridName());
             if (null == cacheGridName){
                 nums.add(num);
-                disposeErrorMsg(info,ImportErrorMsgConstants.BUILDING_ERROR);
+                disposeErrorMsg(info,BELONG_GRID_ERROR);
                 return;
             }
             dto.setGridId(cacheGridName.toString());
@@ -330,7 +332,7 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
             AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(dto.getAgencyId());
             if (null == agencyInfo){
                 nums.add(num);
-                disposeErrorMsg(info, ImportErrorMsgConstants.BUILDING_ERROR);
+                disposeErrorMsg(info, BELONG_AGENCY_ERROR);
                 return;
             }
             dto.setPid(agencyInfo.getPid());
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 d3bd8dc768..fd69361586 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
@@ -36,6 +36,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import static com.epmet.constant.ImportErrorMsgConstants.*;
+
 /**
  * @Author zxc
  * @DateTime 2022/2/13 1:25 下午
@@ -163,7 +165,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
         if (StringUtils.isNotBlank(dto.getHouseType()) ){
             if( !"楼房".equals(dto.getHouseType()) && !dto.getHouseType().equals("平房") && !dto.getHouseType().equals("别墅") ){
                 nums.add(num);
-                disposeErrorMsg(info,"房屋类型的值未填写或者所填写信息在系统中未找到");
+                disposeErrorMsg(info,HOUSE_TYPE_ERROR);
                 return;
             }
         }
@@ -229,7 +231,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
                         if (!r.getAddStatus()){
                             nums.add(r.getNum());
                             info = ConvertUtils.sourceToTarget(r,HouseInfoModel.class);
-                            disposeErrorMsg(info,"文件中存在重复数据");
+                            disposeErrorMsg(info,DOCUMENT_EXIST_ERROR);
                             r.setExistStatus(true);
                             r.setAddStatus(true);
                         }
@@ -302,7 +304,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
             GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(buildingGeneralDTO.getGridId());
             if (null == gridInfo){
                 nums.add(num);
-                disposeErrorMsg(info, "所属网格的值未填写或者所填写信息在系统中未找到");
+                disposeErrorMsg(info, BELONG_GRID_ERROR);
                 return;
             }
             // 排除 1、小区名不一样&&楼栋名一样 2、网格名不一样&&小区名一样&&楼名一样 3、组织名不一样&&网格名一样&&小区名一样&&楼名一样
@@ -310,7 +312,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
                     || (!gridInfo.getGridName().equals(dto.getGridName())&&buildingGeneralDTO.getNeighborHoodName().equals(dto.getNeighborHoodName()) && buildingGeneralDTO.getBuildingName().equals(dto.getBuildingName()))
                     || (!gridInfo.getAgencyName().equals(dto.getAgencyName())&&gridInfo.getGridName().equals(dto.getGridName())&&buildingGeneralDTO.getNeighborHoodName().equals(dto.getNeighborHoodName()) && buildingGeneralDTO.getBuildingName().equals(dto.getBuildingName()))){
                 nums.add(num);
-                disposeErrorMsg(info,ImportErrorMsgConstants.HOUSE_ERROR);
+                disposeErrorMsg(info,BELONG_GRID_ERROR);
                 return;
             }
             dto.setBuildingId(formDTO.getOrgId());
@@ -320,7 +322,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
             AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(dto.getAgencyId());
             if (null == agencyInfo){
                 nums.add(num);
-                disposeErrorMsg(info, "所属组织的值未填写或者所填写信息在系统中未找到");
+                disposeErrorMsg(info, BELONG_AGENCY_ERROR);
                 return;
             }
             dto.setPid(agencyInfo.getPid());
@@ -358,14 +360,14 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
             GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(neighborHoodGeneralDTO.getGridId());
             if (null == gridInfo){
                 nums.add(num);
-                disposeErrorMsg(info, "所属网格的值未填写或者所填写信息在系统中未找到");
+                disposeErrorMsg(info, BELONG_GRID_ERROR);
                 return;
             }
             // 1.排除网格名不一样但小区名一样 2.排除组织不一样，网格一样，小区一样
             if ((!gridInfo.getGridName().equals(dto.getGridName()) && neighborHoodGeneralDTO.getNeighborHoodName().equals(dto.getNeighborHoodName())) ||
                     (!gridInfo.getAgencyName().equals(dto.getAgencyName()) && gridInfo.getGridName().equals(dto.getGridName()) && neighborHoodGeneralDTO.getNeighborHoodName().equals(dto.getNeighborHoodName()))){
                 nums.add(num);
-                disposeErrorMsg(info,ImportErrorMsgConstants.HOUSE_ERROR);
+                disposeErrorMsg(info,BELONG_GRID_ERROR);
                 return;
             }
             dto.setNeighborHoodId(formDTO.getOrgId());
@@ -374,7 +376,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
             AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(dto.getAgencyId());
             if (null == agencyInfo){
                 nums.add(num);
-                disposeErrorMsg(info, "所属组织的值未填写或者所填写信息在系统中未找到");
+                disposeErrorMsg(info, BELONG_AGENCY_ERROR);
                 return;
             }
             dto.setPid(agencyInfo.getPid());
@@ -395,13 +397,13 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
         GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(formDTO.getOrgId());
         if (null == gridInfo){
             nums.add(num);
-            disposeErrorMsg(info, "所属网格的值未填写或者所填写信息在系统中未找到");
+            disposeErrorMsg(info, BELONG_GRID_ERROR);
             return;
         }
         //排除不是本网格的 gridName不一样排除，gridName一样但是agencyName不一样也得排除
         if (dto.getGridName().compareTo(gridName) != 0 || (!dto.getAgencyName().equals(gridInfo.getAgencyName()) && dto.getGridName().equals(gridName))){
             nums.add(num);
-            disposeErrorMsg(info,ImportErrorMsgConstants.HOUSE_ERROR);
+            disposeErrorMsg(info,BELONG_GRID_ERROR);
         }else {
             //
             dto.setGridId(formDTO.getOrgId());
@@ -409,7 +411,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
             AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(dto.getAgencyId());
             if (null == agencyInfo){
                 nums.add(num);
-                disposeErrorMsg(info, "所属组织的值未填写或者所填写信息在系统中未找到");
+                disposeErrorMsg(info, BELONG_AGENCY_ERROR);
                 return;
             }
             dto.setPid(agencyInfo.getPid());
@@ -430,21 +432,21 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
         //排除不是本组织的
         if (!dto.getAgencyName().equals(agencyName)){
             nums.add(num);
-            disposeErrorMsg(info,"所属组织的值未填写或者所填写信息在系统中未找到");
+            disposeErrorMsg(info,BELONG_AGENCY_ERROR);
         }else {
             // 根据组织查询出所有网格，甩出不是本组织下的网格
             gridInfos = null == gridInfos ? getGridInfos(formDTO.getOrgId()) : gridInfos;
             if (null == gridInfos){
                 // 组织下确实不存在网格
                 nums.add(num);
-                disposeErrorMsg(info,"所属网格的值未填写或者所填写信息在系统中未找到");
+                disposeErrorMsg(info,BELONG_GRID_ERROR);
                 return;
             }
             // 根据网格名对比，没有找到的就把行号加入到未执行成功队列中
             Object cacheGridName = icHouseRedis.getTemporaryCacheGrid(formDTO.getCustomerId(), formDTO.getUserId(), dto.getGridName());
             if (null == cacheGridName){
                 nums.add(num);
-                disposeErrorMsg(info,"所属网格的值未填写或者所填写信息在系统中未找到");
+                disposeErrorMsg(info,BELONG_GRID_ERROR);
                 return;
             }
             dto.setGridId(cacheGridName.toString());
@@ -452,7 +454,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
             AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(dto.getAgencyId());
             if (null == agencyInfo){
                 nums.add(num);
-                disposeErrorMsg(info, "所属组织的值未填写或者所填写信息在系统中未找到");
+                disposeErrorMsg(info, BELONG_AGENCY_ERROR);
                 return;
             }
             dto.setPid(agencyInfo.getPid());
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java
index d3b999687f..2b9a20cf80 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java
@@ -33,6 +33,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import static com.epmet.constant.ImportErrorMsgConstants.*;
+
 /**
  * @Author zxc
  * @DateTime 2022/2/15 2:16 下午
@@ -84,11 +86,10 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
         }
         info = data;
         num = num + NumConstant.ONE;
-        log.info("读数据"+num);
         if (StringUtils.isBlank(data.getNeighborHoodName()) ||
                 StringUtils.isBlank(data.getGridName()) || StringUtils.isBlank(data.getAgencyName()) || StringUtils.isBlank(data.getAddress())){
             nums.add(num);
-            disposeErrorMsg(info,ImportErrorMsgConstants.NEIGHBOR_HOOD_ERROR);
+            disposeErrorMsg(info,NEIGHBORHOOD_TYPE_ERROR);
             return;
         }
         if(StringUtils.isBlank(data.getAgencyName())){
@@ -123,7 +124,6 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
         if (num%NumConstant.ONE_HUNDRED == NumConstant.ZERO){
             finalDispose();
         }
-        log.info("读数据"+num+"完毕");
     }
 
     public void finalDispose(){
@@ -140,7 +140,7 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
                             // 集合里重复的
                             nums.add(r.getNum());
                             NeighborHoodInfoModel neighborHoodInfoModel = ConvertUtils.sourceToTarget(r, NeighborHoodInfoModel.class);
-                            disposeErrorMsg(neighborHoodInfoModel, ImportErrorMsgConstants.EXIST_ERROR);
+                            disposeErrorMsg(neighborHoodInfoModel, DOCUMENT_EXIST_ERROR);
                             r.setExistStatus(true);
                             r.setAddStatus(true);
                         }
@@ -219,13 +219,13 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
         GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(formDTO.getOrgId());
         if (null == gridInfo){
             nums.add(num);
-            disposeErrorMsg(info,ImportErrorMsgConstants.NEIGHBOR_HOOD_ERROR);
+            disposeErrorMsg(info,BELONG_GRID_ERROR);
             return;
         }
         //排除不是本网格的 gridName不一样排除，gridName一样但是agencyName不一样也得排除
         if (dto.getGridName().compareTo(gridName) != 0 || (!dto.getAgencyName().equals(gridInfo.getAgencyName()) && dto.getGridName().equals(gridName))){
             nums.add(num);
-            disposeErrorMsg(info,ImportErrorMsgConstants.NEIGHBOR_HOOD_ERROR);
+            disposeErrorMsg(info,BELONG_GRID_ERROR);
         }else {
             //
             dto.setGridId(formDTO.getOrgId());
@@ -233,7 +233,7 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
             AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(dto.getAgencyId());
             if (null == agencyInfo){
                 nums.add(num);
-                disposeErrorMsg(info,ImportErrorMsgConstants.NEIGHBOR_HOOD_ERROR);
+                disposeErrorMsg(info,BELONG_AGENCY_ERROR);
                 return;
             }
             dto.setPid(agencyInfo.getPid());
@@ -253,21 +253,21 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
         //排除不是本组织的
         if (!dto.getAgencyName().equals(agencyName)){
             nums.add(num);
-            disposeErrorMsg(info,ImportErrorMsgConstants.NEIGHBOR_HOOD_ERROR);
+            disposeErrorMsg(info,BELONG_AGENCY_ERROR);
         }else {
             // 根据组织查询出所有网格，甩出不是本组织下的网格
             gridInfos = null == gridInfos ? getGridInfos(formDTO.getOrgId()) : gridInfos;
             if (null == gridInfos){
                 // 组织下确实不存在网格
                 nums.add(num);
-                disposeErrorMsg(info,ImportErrorMsgConstants.NEIGHBOR_HOOD_ERROR);
+                disposeErrorMsg(info,BELONG_GRID_ERROR);
                 return;
             }
             // 根据网格名对比，没有找到的就把行号加入到未执行成功队列中
             Object cacheGridName = icHouseRedis.getTemporaryCacheGrid(formDTO.getCustomerId(), formDTO.getUserId(), dto.getGridName());
             if (null == cacheGridName){
                 nums.add(num);
-                disposeErrorMsg(info,ImportErrorMsgConstants.NEIGHBOR_HOOD_ERROR);
+                disposeErrorMsg(info,BELONG_GRID_ERROR);
                 return;
             }
             dto.setGridId(cacheGridName.toString());
@@ -275,7 +275,7 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
             AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(dto.getAgencyId());
             if (null == agencyInfo){
                 nums.add(num);
-                disposeErrorMsg(info,ImportErrorMsgConstants.NEIGHBOR_HOOD_ERROR);
+                disposeErrorMsg(info,BELONG_AGENCY_ERROR);
                 return;
             }
             dto.setPid(agencyInfo.getPid());

From a20562d78bd9fdc1200a569d4177ec34df4993d2 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Fri, 15 Apr 2022 16:52:38 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=A5=BC=E6=A0=8B=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=8D=95=E5=85=83=E6=95=B0=E6=97=B6=EF=BC=8C=E4=BB=8E=E5=A4=B4?=
 =?UTF-8?q?=E5=BC=80=E5=A7=8B=E6=96=B0=E5=A2=9E=E5=8D=95=E5=85=83=EF=BC=8C?=
 =?UTF-8?q?=E5=A6=82=E6=9E=9C=E5=8E=9F=E5=85=88=E5=B7=B2=E5=AD=98=E5=9C=A8?=
 =?UTF-8?q?=EF=BC=8C=E5=88=99=E7=95=A5=E8=BF=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tools/dto/result/OptionResultDTO.java     |  1 +
 .../service/impl/BuildingServiceImpl.java     | 20 ++++++++++++-------
 .../impl/IcBuildingUnitServiceImpl.java       |  1 +
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionResultDTO.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionResultDTO.java
index 8c42570bc3..95741eb813 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionResultDTO.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionResultDTO.java
@@ -14,6 +14,7 @@ import java.util.List;
 public class OptionResultDTO implements Serializable {
     private static final long serialVersionUID = 8618231166600518980L;
     private String label;
+    private String code;
     private String value;
     private String pValue;
     private String sysDictDataId;
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 04670fde28..3511bfc536 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
@@ -12,6 +12,7 @@ import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
+import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
@@ -537,14 +538,19 @@ public class BuildingServiceImpl implements BuildingService {
         Integer unit = icBuilding.getTotalUnitNum();
         if(nowUnit>=unit){
             //新增单元
+            List<OptionResultDTO> units = icBuildingUnitService.getUnitOptions(icBuilding.getId());
+            Map<String, String> unitMap = units.stream().collect(Collectors.toMap(OptionResultDTO::getCode, OptionResultDTO::getLabel));
             List<IcBuildingUnitEntity> unitList = new ArrayList<>();
-            for(int i =unit ;i<nowUnit;i++){
-                IcBuildingUnitEntity icBuildingUnit= new IcBuildingUnitEntity();
-                icBuildingUnit.setBuildingId(icBuilding.getId());
-                icBuildingUnit.setCustomerId(customerId);
-                icBuildingUnit.setUnitName((i + 1) +"单元");
-                icBuildingUnit.setUnitNum(String.valueOf(i+1));
-                unitList.add(icBuildingUnit);
+            for(int i = 1 ;i<nowUnit;i++){
+                String unitNum = String.valueOf(i);
+                if (!unitMap.containsKey(unitNum)) {
+                    IcBuildingUnitEntity icBuildingUnit = new IcBuildingUnitEntity();
+                    icBuildingUnit.setBuildingId(icBuilding.getId());
+                    icBuildingUnit.setCustomerId(customerId);
+                    icBuildingUnit.setUnitName(unitNum + "单元");
+                    icBuildingUnit.setUnitNum(unitNum);
+                    unitList.add(icBuildingUnit);
+                }
             }
             icBuildingUnitService.insertBatch(unitList);
         }else{
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingUnitServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingUnitServiceImpl.java
index ae1fd471a9..2e800bbda5 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingUnitServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingUnitServiceImpl.java
@@ -128,6 +128,7 @@ public class IcBuildingUnitServiceImpl extends BaseServiceImpl<IcBuildingUnitDao
         return list.stream().map(item -> {
             OptionResultDTO dto = new OptionResultDTO();
             dto.setValue(item.getId());
+            dto.setCode(item.getUnitNum());
             dto.setLabel(item.getUnitName());
             return dto;
         }).collect(Collectors.toList());