diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/EarlyWarningInstanceNotStartTask.java b/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/EarlyWarningInstanceNotStartTask.java index af7e464..e203461 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/EarlyWarningInstanceNotStartTask.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/EarlyWarningInstanceNotStartTask.java @@ -129,8 +129,11 @@ public class EarlyWarningInstanceNotStartTask { } } - if(Duration.between(LocalDateTime.now(),p.getUpdateOn()).getSeconds() >= time * 60 && //time * 60 - Duration.between(LocalDateTime.now(),p.getUpdateOn()).getSeconds() <= time * 60 + 119){ //time * 60 + log.info("projectId :{}",p.getId()); + log.info("秒数差 :{}",Duration.between(p.getUpdateOn(),LocalDateTime.now()).getSeconds()); + + if(Duration.between(p.getUpdateOn(),LocalDateTime.now()).getSeconds() >= time * 60 && //time * 60 + Duration.between(p.getUpdateOn(),LocalDateTime.now()).getSeconds() <= time * 60 + 119){ //time * 60 return Boolean.TRUE; } return Boolean.FALSE; @@ -246,14 +249,14 @@ public class EarlyWarningInstanceNotStartTask { Operation operation = operationMap.get(p.getProjectCode()); if(WarningOperationTypeEnum.CHUYAN.getCode().equals(biz)){ //初验 - if(Duration.between(LocalDateTime.now(),operation.getInitialInspectionDate()).getSeconds() >= time * 60 && //time * 60 - Duration.between(LocalDateTime.now(),operation.getInitialInspectionDate()).getSeconds() <= time * 60 + 119){ //time * 60 + if(Duration.between(operation.getInitialInspectionDate(),LocalDateTime.now()).getSeconds() >= time * 60 && //time * 60 + Duration.between(operation.getInitialInspectionDate(),LocalDateTime.now()).getSeconds() <= time * 60 + 119){ //time * 60 return Boolean.TRUE; } }else if(WarningOperationTypeEnum.ZHONGYAN.getCode().equals(biz)){ //终验 - if(Duration.between(LocalDateTime.now(),operation.getFinalInspectionDate()).getSeconds() >= time * 60 && //time * 60 - Duration.between(LocalDateTime.now(),operation.getFinalInspectionDate()).getSeconds() <= time * 60 + 119){ //time * 60 + if(Duration.between(operation.getFinalInspectionDate(),LocalDateTime.now()).getSeconds() >= time * 60 && //time * 60 + Duration.between(operation.getFinalInspectionDate(),LocalDateTime.now()).getSeconds() <= time * 60 + 119){ //time * 60 return Boolean.TRUE; } }