From 680336195d185293295e57e41c6543f4262f5d42 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 4 Mar 2022 14:06:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model/ImportBuildingInfoListener.java     | 21 ++++++++++----
 .../epmet/model/ImportHouseInfoListener.java  | 29 ++++++++++++++-----
 .../model/ImportNeighborHoodInfoListener.java | 13 +++++++--
 3 files changed, 48 insertions(+), 15 deletions(-)

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 27ab369129..6c1963888a 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
@@ -223,7 +223,9 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
         }else {
             GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(neighborHoodGeneralDTO.getGridId());
             if (null == gridInfo){
-                throw new EpmetException("查询网格失败...");
+                nums.add(num);
+                disposeErrorMsg(info, ImportErrorMsgConstants.BUILDING_ERROR);
+                return;
             }
             // 1.排除网格名不一样但小区名一样 2.排除组织不一样，网格一样，小区一样
             if ((!gridInfo.getGridName().equals(dto.getGridName()) && neighborHoodGeneralDTO.getNeighborHoodName().equals(dto.getNeighborHoodName())) ||
@@ -237,7 +239,9 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
             dto.setAgencyId(neighborHoodGeneralDTO.getAgencyId());
             AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(dto.getAgencyId());
             if (null == agencyInfo){
-                throw new EpmetException("查询组织信息失败...");
+                nums.add(num);
+                disposeErrorMsg(info, ImportErrorMsgConstants.BUILDING_ERROR);
+                return;
             }
             dto.setPid(agencyInfo.getPid());
             dto.setPids(agencyInfo.getPids());
@@ -256,7 +260,9 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
         gridName = null == gridName ? icBuildingDao.selectGridNameById(formDTO.getOrgId()) : gridName;
         GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(formDTO.getOrgId());
         if (null == gridInfo){
-            throw new EpmetException("查询网格失败...");
+            nums.add(num);
+            disposeErrorMsg(info, ImportErrorMsgConstants.BUILDING_ERROR);
+            return;
         }
         //排除不是本网格的 gridName不一样排除，gridName一样但是agencyName不一样也得排除
         if (dto.getGridName().compareTo(gridName) != 0 || (!dto.getAgencyName().equals(gridInfo.getAgencyName()) && dto.getGridName().equals(gridName))){
@@ -268,7 +274,9 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
             dto.setAgencyId(gridInfo.getPid());
             AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(dto.getAgencyId());
             if (null == agencyInfo){
-                throw new EpmetException("查询组织信息失败...");
+                nums.add(num);
+                disposeErrorMsg(info, ImportErrorMsgConstants.BUILDING_ERROR);
+                return;
             }
             dto.setPid(agencyInfo.getPid());
             dto.setPids(agencyInfo.getPids());
@@ -309,7 +317,9 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
             dto.setAgencyId(formDTO.getOrgId());
             AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(dto.getAgencyId());
             if (null == agencyInfo){
-                throw new EpmetException("查询组织信息失败...");
+                nums.add(num);
+                disposeErrorMsg(info, ImportErrorMsgConstants.BUILDING_ERROR);
+                return;
             }
             dto.setPid(agencyInfo.getPid());
             dto.setPids(agencyInfo.getPids());
@@ -387,6 +397,7 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
                     String s = neighborHoodService.orgGeneralImport(errorInfos, BuildingErrorInfoModel.class);
                     input.setResultDescFilePath(s);
                 } catch (IOException e) {
+                    epmetCommonServiceOpenFeignClient.finishImportTask(input);
                     e.printStackTrace();
                 }
             }
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 91de751dbe..60b609752c 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
@@ -270,7 +270,9 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
         }else {
             GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(buildingGeneralDTO.getGridId());
             if (null == gridInfo){
-                throw new EpmetException("查询网格失败...");
+                nums.add(num);
+                disposeErrorMsg(info, ImportErrorMsgConstants.HOUSE_ERROR);
+                return;
             }
             // 排除 1、小区名不一样&&楼栋名一样 2、网格名不一样&&小区名一样&&楼名一样 3、组织名不一样&&网格名一样&&小区名一样&&楼名一样
             if ((!buildingGeneralDTO.getNeighborHoodName().equals(dto.getNeighborHoodName()) && buildingGeneralDTO.getBuildingName().equals(dto.getBuildingName()))
@@ -286,7 +288,9 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
             dto.setAgencyId(buildingGeneralDTO.getAgencyId());
             AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(dto.getAgencyId());
             if (null == agencyInfo){
-                throw new EpmetException("查询组织信息失败...");
+                nums.add(num);
+                disposeErrorMsg(info, ImportErrorMsgConstants.HOUSE_ERROR);
+                return;
             }
             dto.setPid(agencyInfo.getPid());
             dto.setPids(agencyInfo.getPids());
@@ -322,7 +326,9 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
         }else {
             GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(neighborHoodGeneralDTO.getGridId());
             if (null == gridInfo){
-                throw new EpmetException("查询网格失败...");
+                nums.add(num);
+                disposeErrorMsg(info, ImportErrorMsgConstants.HOUSE_ERROR);
+                return;
             }
             // 1.排除网格名不一样但小区名一样 2.排除组织不一样，网格一样，小区一样
             if ((!gridInfo.getGridName().equals(dto.getGridName()) && neighborHoodGeneralDTO.getNeighborHoodName().equals(dto.getNeighborHoodName())) ||
@@ -336,7 +342,9 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
             dto.setAgencyId(neighborHoodGeneralDTO.getAgencyId());
             AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(dto.getAgencyId());
             if (null == agencyInfo){
-                throw new EpmetException("查询组织信息失败...");
+                nums.add(num);
+                disposeErrorMsg(info, ImportErrorMsgConstants.HOUSE_ERROR);
+                return;
             }
             dto.setPid(agencyInfo.getPid());
             dto.setPids(agencyInfo.getPids());
@@ -355,7 +363,9 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
         gridName = null == gridName ? icBuildingDao.selectGridNameById(formDTO.getOrgId()) : gridName;
         GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(formDTO.getOrgId());
         if (null == gridInfo){
-            throw new EpmetException("查询网格失败...");
+            nums.add(num);
+            disposeErrorMsg(info, ImportErrorMsgConstants.HOUSE_ERROR);
+            return;
         }
         //排除不是本网格的 gridName不一样排除，gridName一样但是agencyName不一样也得排除
         if (dto.getGridName().compareTo(gridName) != 0 || (!dto.getAgencyName().equals(gridInfo.getAgencyName()) && dto.getGridName().equals(gridName))){
@@ -367,7 +377,9 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
             dto.setAgencyId(gridInfo.getPid());
             AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(dto.getAgencyId());
             if (null == agencyInfo){
-                throw new EpmetException("查询组织信息失败...");
+                nums.add(num);
+                disposeErrorMsg(info, ImportErrorMsgConstants.HOUSE_ERROR);
+                return;
             }
             dto.setPid(agencyInfo.getPid());
             dto.setPids(agencyInfo.getPids());
@@ -408,7 +420,9 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
             dto.setAgencyId(formDTO.getOrgId());
             AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(dto.getAgencyId());
             if (null == agencyInfo){
-                throw new EpmetException("查询组织信息失败...");
+                nums.add(num);
+                disposeErrorMsg(info, ImportErrorMsgConstants.HOUSE_ERROR);
+                return;
             }
             dto.setPid(agencyInfo.getPid());
             dto.setPids(agencyInfo.getPids());
@@ -541,6 +555,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
                     String s = neighborHoodService.orgGeneralImport(errorInfos, HouseErrorInfoModel.class);
                     input.setResultDescFilePath(s);
                 } catch (IOException e) {
+                    epmetCommonServiceOpenFeignClient.finishImportTask(input);
                     e.printStackTrace();
                 }
             }
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 4e85a407c1..212b8c10e6 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
@@ -207,7 +207,9 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
         gridName = null == gridName ? icBuildingDao.selectGridNameById(formDTO.getOrgId()) : gridName;
         GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(formDTO.getOrgId());
         if (null == gridInfo){
-            throw new EpmetException("查询网格失败...");
+            nums.add(num);
+            disposeErrorMsg(info,ImportErrorMsgConstants.NEIGHBOR_HOOD_ERROR);
+            return;
         }
         //排除不是本网格的 gridName不一样排除，gridName一样但是agencyName不一样也得排除
         if (dto.getGridName().compareTo(gridName) != 0 || (!dto.getAgencyName().equals(gridInfo.getAgencyName()) && dto.getGridName().equals(gridName))){
@@ -219,7 +221,9 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
             dto.setAgencyId(gridInfo.getPid());
             AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(dto.getAgencyId());
             if (null == agencyInfo){
-                throw new EpmetException("查询组织信息失败...");
+                nums.add(num);
+                disposeErrorMsg(info,ImportErrorMsgConstants.NEIGHBOR_HOOD_ERROR);
+                return;
             }
             dto.setPid(agencyInfo.getPid());
             dto.setPids(agencyInfo.getPids());
@@ -259,7 +263,9 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
             dto.setAgencyId(formDTO.getOrgId());
             AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(dto.getAgencyId());
             if (null == agencyInfo){
-                throw new EpmetException("查询组织信息失败...");
+                nums.add(num);
+                disposeErrorMsg(info,ImportErrorMsgConstants.NEIGHBOR_HOOD_ERROR);
+                return;
             }
             dto.setPid(agencyInfo.getPid());
             dto.setPids(agencyInfo.getPids());
@@ -343,6 +349,7 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
                     String s = neighborHoodService.orgGeneralImport(errorInfos, NeighborHoodErrorInfoModel.class);
                     input.setResultDescFilePath(s);
                 } catch (IOException e) {
+                    epmetCommonServiceOpenFeignClient.finishImportTask(input);
                     e.printStackTrace();
                 }
             }