修改逻辑

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();
+    int deleteAll();
 }

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();
 
     /**
      * 平房详情

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();
 
     /**
      * 出租房详情

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();
 
     /**
      * 人口基本信息详情

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();
 
     /**
      * 流动人口详情

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaLoudongServiceImpl.java

@@ -135,7 +135,8 @@ public class CaLoudongServiceImpl extends BaseServiceImpl<CaLoudongDao, CaLoudon
      */
     @Override
     public void preserLouDongVation(PreserVationFormDTO dto) {
-        baseDao.deleteAll();
+        int i = baseDao.deleteAll();
+        if (i >= 0) {
             dto.setPageNo(NumConstant.ONE);
             dto.setPageSize(NumConstant.FIFTY);
             dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_UNICOM);
@@ -159,6 +160,8 @@ public class CaLoudongServiceImpl extends BaseServiceImpl<CaLoudongDao, CaLoudon
             } while (total > (pageNo * NumConstant.FIFTY));
         }
 
+    }
+
 
     private int listLouDong(PreserVationFormDTO dto) throws Exception {
         String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY);

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaPingfangServiceImpl.java

@@ -114,8 +114,8 @@ public class CaPingfangServiceImpl extends BaseServiceImpl<CaPingfangDao, CaPing
      */
     @Override
     public void preserPingFangVation(PreserVationFormDTO dto) {
-        baseDao.deleteAll();
-
+        int i = baseDao.deleteAll();
+        if (i >= 0) {
             dto.setPageNo(NumConstant.ONE);
             dto.setPageSize(NumConstant.FIFTY);
             dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_UNICOM);
@@ -139,6 +139,8 @@ public class CaPingfangServiceImpl extends BaseServiceImpl<CaPingfangDao, CaPing
             } while (total > (pageNo * NumConstant.FIFTY));
         }
 
+    }
+
 
     @Override
     public CaPingFangDetailsResultDTO getPingFangDetails(CaPingFangDetailsFormDTO dto) {
@@ -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);

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRentalServiceImpl.java

@@ -119,8 +119,9 @@ public class CaRentalServiceImpl extends BaseServiceImpl<CaRentalDao, CaRentalEn
      */
     @Override
     public void preserRentalVation(PreserVationFormDTO dto) {
-        baseDao.deleteAll();
+        int i = baseDao.deleteAll();
 
+        if (i >= 0) {
             dto.setPageNo(NumConstant.ONE);
             dto.setPageSize(NumConstant.FIFTY);
             dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_UNICOM);
@@ -145,6 +146,8 @@ public class CaRentalServiceImpl extends BaseServiceImpl<CaRentalDao, CaRentalEn
 
         }
 
+    }
+
     @Override
     public CaRentalDetailsResultDTO getRentalDetails(CaRentalDetailsFormDTO dto) {
         CaRentalDetailsResultDTO result = baseDao.getRentalDetails(dto.getRentalId());

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaResidentServiceImpl.java

@@ -122,8 +122,8 @@ public class CaResidentServiceImpl extends BaseServiceImpl<CaResidentDao, CaResi
      */
     @Override
     public void preserResidentVation(PreserVationFormDTO dto) {
-        baseDao.deleteAll();
-
+        int i = baseDao.deleteAll();
+        if (i >= 0) {
             dto.setPageNo(NumConstant.ONE);
             dto.setPageSize(NumConstant.FIFTY);
             dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_UNICOM);
@@ -146,6 +146,7 @@ public class CaResidentServiceImpl extends BaseServiceImpl<CaResidentDao, CaResi
                 }
             } while (total > (pageNo * NumConstant.FIFTY));
         }
+    }
 
     @Override
     public CaResidentDetailsResultDTO getResidentDetails(CaResidentDetailsFormDTO dto) {
@@ -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);

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRotatorsServiceImpl.java

@@ -122,7 +122,8 @@ public class CaRotatorsServiceImpl extends BaseServiceImpl<CaRotatorsDao, CaRota
      */
     @Override
     public void preserRotatorsVation(PreserVationFormDTO dto) {
-        baseDao.deleteAll();
+        int i = baseDao.deleteAll();
+        if (i >= 0) {
             dto.setPageNo(NumConstant.ONE);
             dto.setPageSize(NumConstant.FIFTY);
             dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_UNICOM);
@@ -146,6 +147,8 @@ public class CaRotatorsServiceImpl extends BaseServiceImpl<CaRotatorsDao, CaRota
             } while (total > (pageNo * NumConstant.FIFTY));
         }
 
+    }
+
     @Override
     public CaRotatorsDetailsResultDTO getRotatorsDetails(CaRotatorsDetailsFormDTO dto) {
         CaRotatorsDetailsResultDTO result = baseDao.getRotatorsDetails(dto.getIdCard());

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,