|
@ -76,7 +76,6 @@ public class EventreportPingyinServiceImpl extends BaseServiceImpl<EventreportPi |
|
|
log.warn("no event data to save table base_conflicts_resolve"); |
|
|
log.warn("no event data to save table base_conflicts_resolve"); |
|
|
return; |
|
|
return; |
|
|
} |
|
|
} |
|
|
log.debug("sql结果" + list.size()); |
|
|
|
|
|
List<EventreportPingyinEntity> entityList = list.stream().map(item -> { |
|
|
List<EventreportPingyinEntity> entityList = list.stream().map(item -> { |
|
|
EventreportPingyinEntity entity = new EventreportPingyinEntity(); |
|
|
EventreportPingyinEntity entity = new EventreportPingyinEntity(); |
|
|
entity.setQxBm("370124"); |
|
|
entity.setQxBm("370124"); |
|
@ -108,9 +107,6 @@ public class EventreportPingyinServiceImpl extends BaseServiceImpl<EventreportPi |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
if (StringUtils.isBlank(entity.getGridUserCardid())) { |
|
|
|
|
|
log.warn("项目" + item.getId() + "的网格员没有身份证ID,舍弃该条数据"); |
|
|
|
|
|
} |
|
|
|
|
|
entity.setReportTime(item.getReportTime()); |
|
|
entity.setReportTime(item.getReportTime()); |
|
|
entity.setHappenTime(item.getHappenDate()); |
|
|
entity.setHappenTime(item.getHappenDate()); |
|
|
entity.setHappenPlace(item.getHappenPlace()); |
|
|
entity.setHappenPlace(item.getHappenPlace()); |
|
@ -139,7 +135,6 @@ public class EventreportPingyinServiceImpl extends BaseServiceImpl<EventreportPi |
|
|
} |
|
|
} |
|
|
return entity; |
|
|
return entity; |
|
|
}).collect(Collectors.toList()); |
|
|
}).collect(Collectors.toList()); |
|
|
log.debug("数据拼装结果" + entityList); |
|
|
|
|
|
//过滤掉必填字段为空的数据
|
|
|
//过滤掉必填字段为空的数据
|
|
|
entityList = entityList.stream().filter(item -> |
|
|
entityList = entityList.stream().filter(item -> |
|
|
StringUtils.isNotBlank(item.getGridCode()) && StringUtils.isNotBlank(item.getGridName()) && |
|
|
StringUtils.isNotBlank(item.getGridCode()) && StringUtils.isNotBlank(item.getGridName()) && |
|
@ -149,7 +144,6 @@ public class EventreportPingyinServiceImpl extends BaseServiceImpl<EventreportPi |
|
|
StringUtils.isNotBlank(item.getGridUserCardid()) && StringUtils.isNotBlank(item.getEventDescription()) && |
|
|
StringUtils.isNotBlank(item.getGridUserCardid()) && StringUtils.isNotBlank(item.getEventDescription()) && |
|
|
StringUtils.isNotBlank(item.getWaysOfResolving()) && null != item.getLng() && null != item.getLat() |
|
|
StringUtils.isNotBlank(item.getWaysOfResolving()) && null != item.getLng() && null != item.getLat() |
|
|
).collect(Collectors.toList()); |
|
|
).collect(Collectors.toList()); |
|
|
log.debug("数据过滤结果" + entityList.size()); |
|
|
|
|
|
if (NumConstant.ZERO_STR.equals(initFlag)) { |
|
|
if (NumConstant.ZERO_STR.equals(initFlag)) { |
|
|
entityList.forEach(entity -> { |
|
|
entityList.forEach(entity -> { |
|
|
LambdaQueryWrapper<EventreportPingyinEntity> wrapper = new LambdaQueryWrapper<>(); |
|
|
LambdaQueryWrapper<EventreportPingyinEntity> wrapper = new LambdaQueryWrapper<>(); |
|
|