Merge branch 'feature/dev_zz_wgh'

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,14 +135,15 @@ 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);
             dto.setTableName(CaWghDataConstant.UNICOM_LOUDONG);
 
             dto.setWhereCase("delete_flag = 'normal'");
-        dto.setOrderBy("grid_id,update_date desc");
+            dto.setOrderBy("grid_id,update_date,building_id desc");
 
             int pageNo = 1;
 
@@ -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,15 +114,15 @@ 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);
             dto.setTableName(CaWghDataConstant.UNICOM_PINGFANG);
 
             dto.setWhereCase("delete_flag = 'normal'");
-        dto.setOrderBy("grid_id,update_date desc");
+            dto.setOrderBy("grid_id,update_date,building_id desc");
 
             int pageNo = 1;
 
@@ -139,6 +139,8 @@ public class CaPingfangServiceImpl extends BaseServiceImpl<CaPingfangDao, CaPing
             } while (total > (pageNo * NumConstant.FIFTY));
         }
 
+    }
+
 
     @Override
     public CaPingFangDetailsResultDTO getPingFangDetails(CaPingFangDetailsFormDTO dto) {

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

@@ -119,15 +119,16 @@ 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);
             dto.setTableName(CaWghDataConstant.UNICOM_RENTAL);
 
             dto.setWhereCase("delete_flag = 'normal'");
-        dto.setOrderBy("grid_id,update_date desc");
+            dto.setOrderBy("grid_id,update_date,rental_id desc");
 
             int pageNo = 1;
 
@@ -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,15 +122,15 @@ 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);
             dto.setTableName(CaWghDataConstant.UNICOM_RESIDENT);
 
             dto.setWhereCase("delete_flag = 'normal'");
-        dto.setOrderBy("grid_id,update_date desc");
+            dto.setOrderBy("grid_id,update_date,resident_id desc");
 
             int pageNo = 1;
 
@@ -146,6 +146,7 @@ public class CaResidentServiceImpl extends BaseServiceImpl<CaResidentDao, CaResi
                 }
             } while (total > (pageNo * NumConstant.FIFTY));
         }
+    }
 
     @Override
     public CaResidentDetailsResultDTO getResidentDetails(CaResidentDetailsFormDTO dto) {

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

@@ -122,14 +122,15 @@ 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);
             dto.setTableName(CaWghDataConstant.UNICOM_ROTATORS);
 
             dto.setWhereCase("delete_flag = 'normal'");
-        dto.setOrderBy("grid_id,update_date desc");
+            dto.setOrderBy("grid_id,update_date,rotators_id desc");
 
             int pageNo = 1;
 
@@ -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/CaLoudongDao.xml

@@ -94,6 +94,7 @@
                 AND building_name like '%${buildingName}%'
             </if>
         </where>
+        order by grid_id,building_id,community_id desc
     </select>
     <select id="getLouDongDetails" resultType="com.epmet.opendata.dto.result.CaLoudongDetailsResultDTO">
     SELECT

epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaPingfangDao.xml

@@ -91,6 +91,7 @@
                 AND community_name like '%${communityName}%'
             </if>
         </where>
+        order by grid_id,building_id,community_id desc
     </select>
     <select id="getPingFangDetails" resultType="com.epmet.opendata.dto.result.CaPingFangDetailsResultDTO">
         select

epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaRentalDao.xml

@@ -86,6 +86,7 @@
                 AND renter_name like '%${renterName}%'
             </if>
         </where>
+        order by grid_id,rental_id,id_card desc
     </select>
     <select id="getRentalDetails" resultType="com.epmet.opendata.dto.result.CaRentalDetailsResultDTO">
         SELECT

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,
@@ -114,6 +115,7 @@
                     AND telephone like '%${telephone}%'
                 </if>
             </where>
+            order by grid_id,resident_id,id_card desc
     </select>
     <select id="getResidentDetails" resultType="com.epmet.opendata.dto.result.CaResidentDetailsResultDTO">
         select

epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaRotatorsDao.xml

@@ -118,6 +118,7 @@
                     AND telephone like '%${telephone}%'
                 </if>
             </where>
+            order by grid_id,rotators_id,id_card desc
     </select>
     <select id="getRotatorsDetails" resultType="com.epmet.opendata.dto.result.CaRotatorsDetailsResultDTO">
         select