fix：定时任务完善

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java

@@ -306,8 +306,12 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl<DataSyncConfigDao
             }
         }else{
             if (logEntity.getDataType() == 1){
+                // 从上次停止的数据开始获取
                 userInfoResultDTOS = getNatUserInfoFromDbForSiWang(logEntity.getDataCount(),50000);
+                // 下面再从别的社区取 isNum = true 凑够50000
+                if (userInfoResultDTOS.size() < 50000){
                     isNum = true;
+                }
             }else if (logEntity.getDataType() == 0){
                 start = logEntity.getDataCount();
             }
@@ -328,7 +332,12 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl<DataSyncConfigDao
             dbResiList = getNatUserInfoFromDbLimit(formDTO);
             dbResiList.addAll(userInfoResultDTOS);
             newLog.setDataType(0);
-            newLog.setDataCount(50000-dbResiList.size());
+            newLog.setDataCount(50000-userInfoResultDTOS.size());
+        }else{
+            if (userInfoResultDTOS.size()>=49999){
+                dbResiList.addAll(userInfoResultDTOS);
+                newLog.setDataType(1);
+                newLog.setDataCount(logEntity.getDataCount()+userInfoResultDTOS.size());
             }else {
                 formDTO.setStart(start);
                 formDTO.setEnd(start+50000);
@@ -345,7 +354,7 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl<DataSyncConfigDao
 
                     }else{
                         newLog.setDataType(1);
-                    newLog.setDataCount(50000-dbResiList.size());
+                        newLog.setDataCount(userInfoResultDTOS.size());
                     }
                 }else{
                     newLog.setDataType(0);
@@ -353,6 +362,8 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl<DataSyncConfigDao
                 }
             }
 
+        }
+
 
 /*        if (CollectionUtils.isEmpty(dbResiList)) {
             continue;
@@ -1739,7 +1750,9 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl<DataSyncConfigDao
                 // 从上次停止的数据开始获取
                 userInfoResultDTOS = getNatUserInfoFromDbForSiWang(logEntity.getDataCount(),50000);
                 // 下面再从别的社区取 isNum = true 凑够50000
+                if (userInfoResultDTOS.size() < 50000){
                     isNum = true;
+                }
             }else if (logEntity.getDataType() == 0){
                 // 如果是普通数据  直接从次停留在特殊数据获取
                 start = logEntity.getDataCount();
@@ -1762,9 +1775,14 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl<DataSyncConfigDao
             dbResiList = getNatUserInfoFromDbLimit(formDTO);
             dbResiList.addAll(userInfoResultDTOS);
             newLog.setDataType(0);
-            newLog.setDataCount(50000-dbResiList.size());
+            newLog.setDataCount(50000-userInfoResultDTOS.size());
         }else{
             // false 说明之前没有获取过特殊数据了
+            if (userInfoResultDTOS.size()>=49999){
+                dbResiList.addAll(userInfoResultDTOS);
+                newLog.setDataType(1);
+                newLog.setDataCount(logEntity.getDataCount()+userInfoResultDTOS.size());
+            }else{
                 formDTO.setStart(start);
                 formDTO.setEnd(start+50000);
                 dbResiList = getNatUserInfoFromDbLimit(formDTO);
@@ -1783,7 +1801,7 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl<DataSyncConfigDao
 
                     }else{
                         newLog.setDataType(1);
-                    newLog.setDataCount(50000-dbResiList.size());
+                        newLog.setDataCount(userInfoResultDTOS.size());
                     }
                 }else{
                     newLog.setDataType(0);
@@ -1791,6 +1809,8 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl<DataSyncConfigDao
                 }
             }
 
+        }
+
 
 /*        if (CollectionUtils.isEmpty(dbResiList)) {
             continue;