diff --git a/event_smart/src/main/java/com/njcn/product/event/dataTransmit/DataSynchronization.java b/event_smart/src/main/java/com/njcn/product/event/dataTransmit/DataSynchronization.java index 624d836..3a98656 100644 --- a/event_smart/src/main/java/com/njcn/product/event/dataTransmit/DataSynchronization.java +++ b/event_smart/src/main/java/com/njcn/product/event/dataTransmit/DataSynchronization.java @@ -215,12 +215,12 @@ public class DataSynchronization { String exportDirName = String.format("%s/%s/%s.json","/event", filePath,"bz_"+fileName); // 查询失败的暂降事件 LambdaQueryWrapper statusPOLambdaQueryWrapper = new LambdaQueryWrapper<>(); - statusPOLambdaQueryWrapper.between(PqsEventDetailStatusPO::getEventTime,start,end); + statusPOLambdaQueryWrapper.between(PqsEventDetailStatusPO::getSyncTime,start,end); List hasList = pqsEventDetailStatusService.list(statusPOLambdaQueryWrapper); Map pqsEventDetailStatusPOMap = hasList.stream().collect(Collectors.toMap(PqsEventDetailStatusPO::getEventDetailId, Function.identity())); // 查询事件 LambdaQueryWrapper pqsEventdetailLambdaQueryWrapper = new LambdaQueryWrapper<>(); - pqsEventdetailLambdaQueryWrapper.between(PqsEventdetail::getCreateTime,start,end); + pqsEventdetailLambdaQueryWrapper.between(PqsEventdetail::getCreateTime,start.minusMinutes(3*10),end); List unsyncedEvents = pqsEventdetailMapper.selectList(pqsEventdetailLambdaQueryWrapper); List tempEvetIds = unsyncedEvents.stream().map(PqsEventdetail::getEventdetailIndex).collect(Collectors.toList()); //查询日志 @@ -259,7 +259,7 @@ public class DataSynchronization { List pqLinedetails = pqLinedetailMapper.selectList(null); Map lineDetailMap = pqLinedetails.stream().collect(Collectors.toMap(PqLinedetail::getLineIndex, Function.identity())); - unSyncIds.forEach(temp->{ + eventIds.forEach(temp->{ PqsEventdetail pqsEventdetail = pqsEventdetailMap.get(temp); if(pqsEventDetailStatusPOMap.containsKey(temp)){