From 8ddadd948e240921d8c5704d65598d416dbb0622 Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Wed, 8 Jun 2022 18:23:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/opendata/dao/CaLoudongDao.java  |  4 +-
 .../com/epmet/opendata/dao/CaPingfangDao.java |  4 +-
 .../com/epmet/opendata/dao/CaRentalDao.java   |  4 +-
 .../com/epmet/opendata/dao/CaResidentDao.java |  4 +-
 .../com/epmet/opendata/dao/CaRotatorsDao.java |  4 +-
 .../service/impl/CaLoudongServiceImpl.java    | 47 +++++++++---------
 .../service/impl/CaPingfangServiceImpl.java   | 48 +++++++++---------
 .../service/impl/CaRentalServiceImpl.java     | 39 ++++++++-------
 .../service/impl/CaResidentServiceImpl.java   | 49 ++++++++++---------
 .../service/impl/CaRotatorsServiceImpl.java   | 47 +++++++++---------
 .../main/resources/mapper/CaResidentDao.xml   |  1 +
 11 files changed, 132 insertions(+), 119 deletions(-)

diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaLoudongDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaLoudongDao.java
index 6d3682d52f..d5d87db881 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaLoudongDao.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaLoudongDao.java
@@ -42,5 +42,5 @@ public interface CaLoudongDao extends BaseDao<CaLoudongEntity> {
      */
     CaLoudongDetailsResultDTO getLouDongDetails(@Param("buildingId") BigInteger buildingId);
 
-    void deleteAll();
-}
\ No newline at end of file
+    int deleteAll();
+}
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaPingfangDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaPingfangDao.java
index 4aa4f98439..ad48accf01 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaPingfangDao.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaPingfangDao.java
@@ -25,7 +25,7 @@ public interface CaPingfangDao extends BaseDao<CaPingfangEntity> {
     List<CaPingfangResultDTO> getPage(@Param("buildingName") String buildingName,
                                       @Param("communityName") String communityName);
 
-    void deleteAll();
+    int deleteAll();
 
     /**
      * 平房详情
@@ -34,4 +34,4 @@ public interface CaPingfangDao extends BaseDao<CaPingfangEntity> {
      * @return
      */
     CaPingFangDetailsResultDTO getPingFangDetails(@Param("buildingId") String buildingId);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaRentalDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaRentalDao.java
index 36490a9bf0..67ecfe2cbd 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaRentalDao.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaRentalDao.java
@@ -30,7 +30,7 @@ public interface CaRentalDao extends BaseDao<CaRentalEntity> {
                                     @Param("houseName") String houseName,
                                     @Param("renterName") String renterName);
 
-    void deleteAll();
+    int deleteAll();
 
     /**
      * 出租房详情
@@ -39,4 +39,4 @@ public interface CaRentalDao extends BaseDao<CaRentalEntity> {
      * @return
      */
     CaRentalDetailsResultDTO getRentalDetails(@Param("rentalId") String rentalId);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaResidentDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaResidentDao.java
index 8838273b8f..5c83b1e4d0 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaResidentDao.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaResidentDao.java
@@ -29,7 +29,7 @@ public interface CaResidentDao extends BaseDao<CaResidentEntity> {
                                       @Param("idCard") String idCard,
                                       @Param("telephone") String telephone);
 
-    void deleteAll();
+    int deleteAll();
 
     /**
      * 人口基本信息详情
@@ -38,4 +38,4 @@ public interface CaResidentDao extends BaseDao<CaResidentEntity> {
      * @return
      */
     CaResidentDetailsResultDTO getResidentDetails(@Param("idCard") String idCard);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaRotatorsDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaRotatorsDao.java
index 8cc71a30cc..8a8787171d 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaRotatorsDao.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaRotatorsDao.java
@@ -30,7 +30,7 @@ public interface CaRotatorsDao extends BaseDao<CaRotatorsEntity> {
                                       @Param("idCard") String idCard,
                                       @Param("telephone") String telephone);
 
-    void deleteAll();
+    int deleteAll();
 
     /**
      * 流动人口详情
@@ -39,4 +39,4 @@ public interface CaRotatorsDao extends BaseDao<CaRotatorsEntity> {
      * @return
      */
     CaRotatorsDetailsResultDTO getRotatorsDetails(@Param("idCard") String idCard);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaLoudongServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaLoudongServiceImpl.java
index 1a6635ce15..a5e55fa6c6 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaLoudongServiceImpl.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaLoudongServiceImpl.java
@@ -135,28 +135,31 @@ public class CaLoudongServiceImpl extends BaseServiceImpl<CaLoudongDao, CaLoudon
      */
     @Override
     public void preserLouDongVation(PreserVationFormDTO dto) {
-        baseDao.deleteAll();
-        dto.setPageNo(NumConstant.ONE);
-        dto.setPageSize(NumConstant.FIFTY);
-        dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_UNICOM);
-        dto.setTableName(CaWghDataConstant.UNICOM_LOUDONG);
-
-        dto.setWhereCase("delete_flag = 'normal'");
-        dto.setOrderBy("grid_id,update_date,building_id desc");
-
-        int pageNo = 1;
-
-        int total = 0;
-
-        do {
-            try {
-                total = listLouDong(dto);
-                pageNo++;
-                dto.setPageNo(pageNo);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        } while (total > (pageNo * NumConstant.FIFTY));
+        int i = baseDao.deleteAll();
+        if (i >= 0) {
+            dto.setPageNo(NumConstant.ONE);
+            dto.setPageSize(NumConstant.FIFTY);
+            dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_UNICOM);
+            dto.setTableName(CaWghDataConstant.UNICOM_LOUDONG);
+
+            dto.setWhereCase("delete_flag = 'normal'");
+            dto.setOrderBy("grid_id,update_date,building_id desc");
+
+            int pageNo = 1;
+
+            int total = 0;
+
+            do {
+                try {
+                    total = listLouDong(dto);
+                    pageNo++;
+                    dto.setPageNo(pageNo);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            } while (total > (pageNo * NumConstant.FIFTY));
+        }
+
     }
 
 
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaPingfangServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaPingfangServiceImpl.java
index 0548e945b2..dcb8823872 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaPingfangServiceImpl.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaPingfangServiceImpl.java
@@ -114,29 +114,31 @@ public class CaPingfangServiceImpl extends BaseServiceImpl<CaPingfangDao, CaPing
      */
     @Override
     public void preserPingFangVation(PreserVationFormDTO dto) {
-        baseDao.deleteAll();
-
-        dto.setPageNo(NumConstant.ONE);
-        dto.setPageSize(NumConstant.FIFTY);
-        dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_UNICOM);
-        dto.setTableName(CaWghDataConstant.UNICOM_PINGFANG);
-
-        dto.setWhereCase("delete_flag = 'normal'");
-        dto.setOrderBy("grid_id,update_date,building_id desc");
-
-        int pageNo = 1;
-
-        int total = 0;
+        int i = baseDao.deleteAll();
+        if (i >= 0) {
+            dto.setPageNo(NumConstant.ONE);
+            dto.setPageSize(NumConstant.FIFTY);
+            dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_UNICOM);
+            dto.setTableName(CaWghDataConstant.UNICOM_PINGFANG);
+
+            dto.setWhereCase("delete_flag = 'normal'");
+            dto.setOrderBy("grid_id,update_date,building_id desc");
+
+            int pageNo = 1;
+
+            int total = 0;
+
+            do {
+                try {
+                    total = listPingFang(dto);
+                    pageNo++;
+                    dto.setPageNo(pageNo);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            } while (total > (pageNo * NumConstant.FIFTY));
+        }
 
-        do {
-            try {
-                total = listPingFang(dto);
-                pageNo++;
-                dto.setPageNo(pageNo);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        } while (total > (pageNo * NumConstant.FIFTY));
     }
 
 
@@ -149,7 +151,7 @@ public class CaPingfangServiceImpl extends BaseServiceImpl<CaPingfangDao, CaPing
     private int listPingFang(PreserVationFormDTO dto) throws Exception {
         String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY);
         JSONObject obj = new JSONObject();
-        obj.put(CaWghDataConstant.UNICOM_CONDITION,aes);
+        obj.put(CaWghDataConstant.UNICOM_CONDITION, aes);
         String data = HttpClientManager.getInstance().sendPostByJSON(CaWghDataConstant.DATA_URL_UNICON, obj.toJSONString()).getData();
         JSONObject toResult = JSON.parseObject(data);
         Result result = ConvertUtils.mapToEntity(toResult, Result.class);
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRentalServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRentalServiceImpl.java
index bed5bf44aa..7104457494 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRentalServiceImpl.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRentalServiceImpl.java
@@ -119,29 +119,32 @@ public class CaRentalServiceImpl extends BaseServiceImpl<CaRentalDao, CaRentalEn
      */
     @Override
     public void preserRentalVation(PreserVationFormDTO dto) {
-        baseDao.deleteAll();
+        int i = baseDao.deleteAll();
 
-        dto.setPageNo(NumConstant.ONE);
-        dto.setPageSize(NumConstant.FIFTY);
-        dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_UNICOM);
-        dto.setTableName(CaWghDataConstant.UNICOM_RENTAL);
+        if (i >= 0) {
+            dto.setPageNo(NumConstant.ONE);
+            dto.setPageSize(NumConstant.FIFTY);
+            dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_UNICOM);
+            dto.setTableName(CaWghDataConstant.UNICOM_RENTAL);
 
-        dto.setWhereCase("delete_flag = 'normal'");
-        dto.setOrderBy("grid_id,update_date,rental_id desc");
+            dto.setWhereCase("delete_flag = 'normal'");
+            dto.setOrderBy("grid_id,update_date,rental_id desc");
 
-        int pageNo = 1;
+            int pageNo = 1;
 
-        int total = 0;
+            int total = 0;
 
-        do {
-            try {
-                total = listRental(dto);
-                pageNo++;
-                dto.setPageNo(pageNo);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        } while (total > (pageNo * NumConstant.FIFTY));
+            do {
+                try {
+                    total = listRental(dto);
+                    pageNo++;
+                    dto.setPageNo(pageNo);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            } while (total > (pageNo * NumConstant.FIFTY));
+
+        }
 
     }
 
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaResidentServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaResidentServiceImpl.java
index 642a984a24..8a6648b5fc 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaResidentServiceImpl.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaResidentServiceImpl.java
@@ -122,29 +122,30 @@ public class CaResidentServiceImpl extends BaseServiceImpl<CaResidentDao, CaResi
      */
     @Override
     public void preserResidentVation(PreserVationFormDTO dto) {
-        baseDao.deleteAll();
-
-        dto.setPageNo(NumConstant.ONE);
-        dto.setPageSize(NumConstant.FIFTY);
-        dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_UNICOM);
-        dto.setTableName(CaWghDataConstant.UNICOM_RESIDENT);
-
-        dto.setWhereCase("delete_flag = 'normal'");
-        dto.setOrderBy("grid_id,update_date,resident_id desc");
-
-        int pageNo = 1;
-
-        int total = 0;
-
-        do {
-            try {
-                total = listResident(dto);
-                pageNo++;
-                dto.setPageNo(pageNo);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        } while (total > (pageNo * NumConstant.FIFTY));
+        int i = baseDao.deleteAll();
+        if (i >= 0) {
+            dto.setPageNo(NumConstant.ONE);
+            dto.setPageSize(NumConstant.FIFTY);
+            dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_UNICOM);
+            dto.setTableName(CaWghDataConstant.UNICOM_RESIDENT);
+
+            dto.setWhereCase("delete_flag = 'normal'");
+            dto.setOrderBy("grid_id,update_date,resident_id desc");
+
+            int pageNo = 1;
+
+            int total = 0;
+
+            do {
+                try {
+                    total = listResident(dto);
+                    pageNo++;
+                    dto.setPageNo(pageNo);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            } while (total > (pageNo * NumConstant.FIFTY));
+        }
     }
 
     @Override
@@ -157,7 +158,7 @@ public class CaResidentServiceImpl extends BaseServiceImpl<CaResidentDao, CaResi
     private int listResident(PreserVationFormDTO dto) throws Exception {
         String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY);
         JSONObject obj = new JSONObject();
-        obj.put(CaWghDataConstant.UNICOM_CONDITION,aes);
+        obj.put(CaWghDataConstant.UNICOM_CONDITION, aes);
         String data = HttpClientManager.getInstance().sendPostByJSON(CaWghDataConstant.DATA_URL_UNICON, obj.toJSONString()).getData();
         JSONObject toResult = JSON.parseObject(data);
         Result result = ConvertUtils.mapToEntity(toResult, Result.class);
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRotatorsServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRotatorsServiceImpl.java
index 31da98c142..1007be5e6c 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRotatorsServiceImpl.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRotatorsServiceImpl.java
@@ -122,28 +122,31 @@ public class CaRotatorsServiceImpl extends BaseServiceImpl<CaRotatorsDao, CaRota
      */
     @Override
     public void preserRotatorsVation(PreserVationFormDTO dto) {
-        baseDao.deleteAll();
-        dto.setPageNo(NumConstant.ONE);
-        dto.setPageSize(NumConstant.FIFTY);
-        dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_UNICOM);
-        dto.setTableName(CaWghDataConstant.UNICOM_ROTATORS);
-
-        dto.setWhereCase("delete_flag = 'normal'");
-        dto.setOrderBy("grid_id,update_date,rotators_id desc");
-
-        int pageNo = 1;
-
-        int total = 0;
-
-        do {
-            try {
-                total = listRotators(dto);
-                pageNo++;
-                dto.setPageNo(pageNo);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        } while (total > (pageNo * NumConstant.FIFTY));
+        int i = baseDao.deleteAll();
+        if (i >= 0) {
+            dto.setPageNo(NumConstant.ONE);
+            dto.setPageSize(NumConstant.FIFTY);
+            dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_UNICOM);
+            dto.setTableName(CaWghDataConstant.UNICOM_ROTATORS);
+
+            dto.setWhereCase("delete_flag = 'normal'");
+            dto.setOrderBy("grid_id,update_date,rotators_id desc");
+
+            int pageNo = 1;
+
+            int total = 0;
+
+            do {
+                try {
+                    total = listRotators(dto);
+                    pageNo++;
+                    dto.setPageNo(pageNo);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            } while (total > (pageNo * NumConstant.FIFTY));
+        }
+
     }
 
     @Override
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaResidentDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaResidentDao.xml
index 233e2cea5f..bf5c94b4c6 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaResidentDao.xml
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaResidentDao.xml
@@ -61,6 +61,7 @@
     <delete id="deleteAll">
         delete from ca_resident
     </delete>
+
     <select id="getPage" resultType="com.epmet.opendata.dto.result.CaResidentResultDTO">
         SELECT
             resident_id,