From 27841f0f4e5329aa21bab1b9edae3d690be6ce75 Mon Sep 17 00:00:00 2001 From: hzj <826100833@qq.com> Date: Wed, 19 Nov 2025 15:41:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E9=A2=91=E6=AC=A1=E4=B8=BA10=E5=88=86=E9=92=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/event/dataTransmit/DataSynchronization.java | 6 +++--- event_smart/src/main/resources/application.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) 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 8a1af38..cad1e43 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 @@ -241,14 +241,14 @@ public class DataSynchronization { Map pqsEventDetailStatusPOMap = hasList.stream().collect(Collectors.toMap(PqsEventDetailStatusPO::getEventDetailId, Function.identity())); // 查询事件 LambdaQueryWrapper pqsEventdetailLambdaQueryWrapper = new LambdaQueryWrapper<>(); - pqsEventdetailLambdaQueryWrapper.between(PqsEventdetail::getCreateTime,start.minusMinutes(3*10),end); + pqsEventdetailLambdaQueryWrapper.between(PqsEventdetail::getCreateTime,start.minusMinutes(6*10),end); List unsyncedEvents = pqsEventdetailMapper.selectList(pqsEventdetailLambdaQueryWrapper); List tempEvetIds = unsyncedEvents.stream().map(PqsEventdetail::getEventdetailIndex).collect(Collectors.toList()); //查询日志 List allEventIds = hasList.stream().map(PqsEventDetailStatusPO::getEventDetailId).collect(Collectors.toList()); List unSyncIds = tempEvetIds.stream().filter(temp -> !allEventIds.contains(temp)).collect(Collectors.toList()); - List failIds = hasList.stream().filter(temp -> temp.getRetryCount() <= 2 && temp.getSyncStatus() == 0).map(PqsEventDetailStatusPO::getEventDetailId).collect(Collectors.toList()); + List failIds = hasList.stream().filter(temp -> temp.getRetryCount() <= 5 && temp.getSyncStatus() == 0).map(PqsEventDetailStatusPO::getEventDetailId).collect(Collectors.toList()); unSyncIds.addAll(failIds); List result = new ArrayList<>(); @@ -286,7 +286,7 @@ public class DataSynchronization { if(pqsEventDetailStatusPOMap.containsKey(temp)){ PqsEventDetailStatusPO pqsEventDetailStatusPO = pqsEventDetailStatusPOMap.get(temp); pqsEventDetailStatusPO.setRetryCount(pqsEventDetailStatusPO.getRetryCount()+1); - if(Objects.nonNull(pqsEventdetail.getWavename())||pqsEventDetailStatusPO.getRetryCount()>2){ + if(Objects.nonNull(pqsEventdetail.getWavename())||pqsEventDetailStatusPO.getRetryCount()>5){ pqsEventDetailStatusPO.setSyncStatus(1); pqsEventDetailStatusPO.setWaveFlag(0); UpLoadEvent upLoadEvent = new UpLoadEvent(); diff --git a/event_smart/src/main/resources/application.yml b/event_smart/src/main/resources/application.yml index 48a832b..c255abd 100644 --- a/event_smart/src/main/resources/application.yml +++ b/event_smart/src/main/resources/application.yml @@ -40,10 +40,10 @@ business: wavePath: D://Comtrade targetPath: /pqmonitor exportBaseDir: D://exportComtrade - eventCronExpression: 0 9 0/1 * * ? - failCronExpression: 0 16 0/1 * * ? + eventCronExpression: 0 0/10 * * * ? + failCronExpression: 0 5/10 * * * ? userCronExpression: 0 5 1 * * ? - syncinterval: 60 + syncinterval: 10 failsyncinterval: 1440 #wavePath: /usr/local/comtrade #处理临时数据