From 2b9de618538f40ffe7606e40552d81ca6b7f29f7 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 25 Mar 2022 09:03:54 +0800
Subject: [PATCH] import

---
 .../java/com/epmet/dto/ImportGeneralDTO.java  |  5 ++++
 .../model/ImportBuildingInfoListener.java     | 18 ++++++++-----
 .../epmet/model/ImportHouseInfoListener.java  | 25 ++++++++++++-------
 .../model/ImportNeighborHoodInfoListener.java | 18 ++++++++-----
 4 files changed, 45 insertions(+), 21 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java
index 9039cda6ef..1d4419e661 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java
@@ -138,6 +138,11 @@ public class ImportGeneralDTO implements Serializable {
 
     private Boolean existStatus = false;
 
+    /**
+     * 错误信息添加状态
+     */
+    private Boolean addStatus = false;
+
     /**
      * 楼栋重复状态
      */
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 6c1963888a..d4d9bde5b2 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
@@ -142,10 +142,13 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
                 for (ImportGeneralDTO r : needDisposeList) {
                     if (k.equals(r.getAgencyName() + "_" + r.getGridName() + "_" +
                             r.getNeighborHoodName() + "_" + r.getBuildingName())){
-                        // 集合里重复的
-                        nums.add(r.getNum());
-                        disposeErrorMsg(info,ImportErrorMsgConstants.EXIST_ERROR);
-                        r.setExistStatus(true);
+                        if (!r.getAddStatus()){
+                            // 集合里重复的
+                            nums.add(r.getNum());
+                            disposeErrorMsg(info,ImportErrorMsgConstants.EXIST_ERROR);
+                            r.setExistStatus(true);
+                            r.setAddStatus(true);
+                        }
                     }
                 }
             }
@@ -158,8 +161,11 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
             List<ImportGeneralDTO> existList = groupByBuildingExistStatus.get(true);
             if (!CollectionUtils.isEmpty(existList)){
                 existList.forEach(e -> {
-                    nums.add(e.getNum());
-                    disposeErrorMsg(info,ImportErrorMsgConstants.EXIST_ERROR);
+                    if (!e.getAddStatus()){
+                        nums.add(e.getNum());
+                        disposeErrorMsg(info,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 60b609752c..f54eb2fa7f 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
@@ -210,13 +210,17 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
         }
         Map<String, Long> collect = needInsertList.stream().collect(Collectors.groupingBy(n -> n.getBuildingUnitId() + "_" + n.getDoorName(), Collectors.counting()));
         collect.forEach((k,v) -> {
-            if (Integer.valueOf(v.toString()).compareTo(1) > 0){
+            if (Integer.valueOf(v.toString()).compareTo(1) != 0){
                 for (ImportGeneralDTO r : needInsertList) {
                     if (k.equals(r.getBuildingUnitId()+"_"+r.getDoorName())){
-                        // 集合里重复的
-                        nums.add(r.getNum());
-                        disposeErrorMsg(info,ImportErrorMsgConstants.EXIST_ERROR);
-                        r.setExistStatus(true);
+                        // 只添加没添加过的
+                        if (!r.getAddStatus()){
+                            // 集合里重复的
+                            nums.add(r.getNum());
+                            disposeErrorMsg(info,ImportErrorMsgConstants.EXIST_ERROR);
+                            r.setExistStatus(true);
+                            r.setAddStatus(true);
+                        }
                     }
                 }
             }
@@ -227,10 +231,13 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
         existHouses.forEach(e -> {
             for (ImportGeneralDTO n : needInsertList) {
                 if ((n.getBuildingUnitId()+"_"+n.getDoorName()).equals(e)){
-                    // 库里存在的
-                    nums.add(n.getNum());
-                    disposeErrorMsg(info,ImportErrorMsgConstants.EXIST_ERROR);
-                    n.setExistStatus(true);
+                    if (!n.getAddStatus()){
+                        // 库里存在的
+                        nums.add(n.getNum());
+                        disposeErrorMsg(info,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 2e326c20f0..2cafbe5f4c 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
@@ -136,10 +136,13 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
             if (Integer.valueOf(v.toString()).compareTo(1) > 0){
                 for (ImportGeneralDTO r : needDisposeList) {
                     if (k.equals(r.getAgencyName() + "_" + r.getGridName() + "_" + r.getNeighborHoodName())){
-                        // 集合里重复的
-                        nums.add(r.getNum());
-                        disposeErrorMsg(info, ImportErrorMsgConstants.EXIST_ERROR);
-                        r.setExistStatus(true);
+                        if (!r.getAddStatus()){
+                            // 集合里重复的
+                            nums.add(r.getNum());
+                            disposeErrorMsg(info, ImportErrorMsgConstants.EXIST_ERROR);
+                            r.setExistStatus(true);
+                            r.setAddStatus(true);
+                        }
                     }
                 }
             }
@@ -152,8 +155,11 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
             List<ImportGeneralDTO> existList = groupByBuildingExistStatus.get(true);
             if (!CollectionUtils.isEmpty(existList)){
                 existList.forEach(e -> {
-                    nums.add(e.getNum());
-                    disposeErrorMsg(info,ImportErrorMsgConstants.EXIST_ERROR);
+                    if (!e.getAddStatus()){
+                        nums.add(e.getNum());
+                        disposeErrorMsg(info,ImportErrorMsgConstants.EXIST_ERROR);
+                        e.setAddStatus(true);
+                    }
                 });
             }
             List<ImportGeneralDTO> notExistList = groupByBuildingExistStatus.get(false);