Merge remote-tracking branch 'remotes/origin/dev_pingyin_7_22' into pingyin_master

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

@@ -135,6 +135,7 @@ public class EventreportPingyinServiceImpl extends BaseServiceImpl<EventreportPi
             }
             return entity;
         }).collect(Collectors.toList());
+        log.info("数据拼装结果" + entityList);
         //过滤掉必填字段为空的数据
         entityList = entityList.stream().filter(item ->
                 StringUtils.isNotBlank(item.getGridCode()) && StringUtils.isNotBlank(item.getGridName()) &&
@@ -144,6 +145,7 @@ public class EventreportPingyinServiceImpl extends BaseServiceImpl<EventreportPi
                 StringUtils.isNotBlank(item.getGridUserCardid()) && StringUtils.isNotBlank(item.getEventDescription()) &&
                 StringUtils.isNotBlank(item.getWaysOfResolving()) && null != item.getLng() && null != item.getLat()
         ).collect(Collectors.toList());
+        log.info("数据过滤结果" + entityList.size());
         if (NumConstant.ZERO_STR.equals(initFlag)) {
             entityList.forEach(entity -> {
                 LambdaQueryWrapper<EventreportPingyinEntity> wrapper = new LambdaQueryWrapper<>();
@@ -152,8 +154,7 @@ public class EventreportPingyinServiceImpl extends BaseServiceImpl<EventreportPi
                 if (null == event) {
                     baseDao.insert(entity);
                 } else {
-                    entity.setId(event.getId());
-                    baseDao.updateById(entity);
+                    baseDao.update(entity, wrapper);
                 }
             });
         } else {