ClientApps/CN_Product
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

暂态事件同步排除以同步的事件

Browse Source
This commit is contained in:
hzj
2025-11-11 11:00:04 +08:00
parent 55f03e3244
commit 2524b13661
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
event_smart/src/main/java/com/njcn/product/event/dataTransmit/DataSynchronization.java
View File

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