From caa7b4b4b269e5d92fd0cc7029ac316c95f99f06 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 25 Mar 2022 10:12:16 +0800
Subject: [PATCH] =?UTF-8?q?import=20=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/model/ImportBuildingInfoListener.java    | 6 ++++--
 .../main/java/com/epmet/model/ImportHouseInfoListener.java  | 6 ++++--
 .../com/epmet/model/ImportNeighborHoodInfoListener.java     | 6 ++++--
 3 files changed, 12 insertions(+), 6 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 d4d9bde5b2..1de117ca35 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
@@ -145,7 +145,8 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
                         if (!r.getAddStatus()){
                             // 集合里重复的
                             nums.add(r.getNum());
-                            disposeErrorMsg(info,ImportErrorMsgConstants.EXIST_ERROR);
+                            BuildingInfoModel buildingInfoModel = ConvertUtils.sourceToTarget(r, BuildingInfoModel.class);
+                            disposeErrorMsg(buildingInfoModel,ImportErrorMsgConstants.EXIST_ERROR);
                             r.setExistStatus(true);
                             r.setAddStatus(true);
                         }
@@ -163,7 +164,8 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
                 existList.forEach(e -> {
                     if (!e.getAddStatus()){
                         nums.add(e.getNum());
-                        disposeErrorMsg(info,ImportErrorMsgConstants.EXIST_ERROR);
+                        BuildingInfoModel buildingInfoModel = ConvertUtils.sourceToTarget(e, BuildingInfoModel.class);
+                        disposeErrorMsg(buildingInfoModel,ImportErrorMsgConstants.EXIST_ERROR);
                         e.setAddStatus(true);
                     }
                 });
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 f54eb2fa7f..ea8c98c040 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
@@ -217,7 +217,8 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
                         if (!r.getAddStatus()){
                             // 集合里重复的
                             nums.add(r.getNum());
-                            disposeErrorMsg(info,ImportErrorMsgConstants.EXIST_ERROR);
+                            HouseInfoModel houseInfoModel = ConvertUtils.sourceToTarget(r, HouseInfoModel.class);
+                            disposeErrorMsg(houseInfoModel,ImportErrorMsgConstants.EXIST_ERROR);
                             r.setExistStatus(true);
                             r.setAddStatus(true);
                         }
@@ -234,7 +235,8 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
                     if (!n.getAddStatus()){
                         // 库里存在的
                         nums.add(n.getNum());
-                        disposeErrorMsg(info,ImportErrorMsgConstants.EXIST_ERROR);
+                        HouseInfoModel houseInfoModel = ConvertUtils.sourceToTarget(n, HouseInfoModel.class);
+                        disposeErrorMsg(houseInfoModel,ImportErrorMsgConstants.EXIST_ERROR);
                         n.setExistStatus(true);
                         n.setAddStatus(true);
                     }
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 2cafbe5f4c..d50de038dd 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
@@ -139,7 +139,8 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
                         if (!r.getAddStatus()){
                             // 集合里重复的
                             nums.add(r.getNum());
-                            disposeErrorMsg(info, ImportErrorMsgConstants.EXIST_ERROR);
+                            NeighborHoodInfoModel neighborHoodInfoModel = ConvertUtils.sourceToTarget(r, NeighborHoodInfoModel.class);
+                            disposeErrorMsg(neighborHoodInfoModel, ImportErrorMsgConstants.EXIST_ERROR);
                             r.setExistStatus(true);
                             r.setAddStatus(true);
                         }
@@ -157,7 +158,8 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
                 existList.forEach(e -> {
                     if (!e.getAddStatus()){
                         nums.add(e.getNum());
-                        disposeErrorMsg(info,ImportErrorMsgConstants.EXIST_ERROR);
+                        NeighborHoodInfoModel neighborHoodInfoModel = ConvertUtils.sourceToTarget(e, NeighborHoodInfoModel.class);
+                        disposeErrorMsg(neighborHoodInfoModel,ImportErrorMsgConstants.EXIST_ERROR);
                         e.setAddStatus(true);
                     }
                 });