新版事件上报第三方

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

@@ -138,8 +138,15 @@ public class EventreportPingyinServiceImpl extends BaseServiceImpl<EventreportPi
             }
             return entity;
         }).collect(Collectors.toList());
-        //过滤掉身份证为空的数据
-        entityList = entityList.stream().filter(item -> StringUtils.isNotBlank(item.getGridUserCardid())).collect(Collectors.toList());
+        //过滤掉必填字段为空的数据
+        entityList = entityList.stream().filter(item ->
+                StringUtils.isNotBlank(item.getGridCode()) && StringUtils.isNotBlank(item.getGridName()) &&
+                StringUtils.isNotBlank(item.getEventCategory()) && StringUtils.isNotBlank(item.getGridUserName()) &&
+                StringUtils.isNotBlank(item.getGridUserCardid()) && null != item.getReportTime() &&
+                null != item.getHappenTime() && StringUtils.isNotBlank(item.getHappenPlace()) &&
+                StringUtils.isNotBlank(item.getGridUserCardid()) && StringUtils.isNotBlank(item.getEventDescription()) &&
+                StringUtils.isNotBlank(item.getWaysOfResolving()) && null != item.getLng() && null != item.getLat()
+        ).collect(Collectors.toList());
         if (NumConstant.ZERO_STR.equals(initFlag)) {
             entityList.forEach(entity -> {
                 LambdaQueryWrapper<EventreportPingyinEntity> wrapper = new LambdaQueryWrapper<>();