Merge branch 'dev_gridmember_fusion' into develop

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsUserServiceImpl.java

@@ -34,6 +34,7 @@ import org.springframework.util.CollectionUtils;
 
 import java.util.Calendar;
 import java.util.Date;
+import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -170,9 +171,12 @@ public class StatsUserServiceImpl implements StatsUserService {
 
         //3.分批处理上传数据
         List<List<GmUploadEventFormDTO.DataList>> partition = ListUtils.partition(formDTO.getDataList(), NumConstant.ONE_HUNDRED);
-        partition.forEach(p -> {
+        for (int i = 0; i < partition.size(); i++) {
+            List<GmUploadEventFormDTO.DataList> p = partition.get(i);
             //4.封装数据并执行
-            p.forEach(m -> {
+            Iterator<GmUploadEventFormDTO.DataList> iterator = p.iterator();
+            while (iterator.hasNext()) {
+                GmUploadEventFormDTO.DataList m = iterator.next();
                 AtomicReference<Boolean> bl = new AtomicReference<>(false);
                 StringBuffer gridPids = new StringBuffer("");
                 agencyList.forEach(ag -> {
@@ -190,13 +194,14 @@ public class StatsUserServiceImpl implements StatsUserService {
                     m.setLatestPatrolStatus("end");
                 } else {
                     log.warn(String.format("网格员事件总数上报,数据错误,根据agencyId未查询到组织信息,客户Id->%s,组织Id->%s", m.getCustomerId(), m.getAgencyId()));
+                    iterator.remove();
                 }
-            });
+            }
             //批量新增或修改数据
             if (!CollectionUtils.isEmpty(p)) {
                 userService.saveOrUpGmUploadEvent(p);
             }
-        });
+        }
 
     }