From bfbdc78d0e413f13c2c3834fdc89b7ec30c64779 Mon Sep 17 00:00:00 2001 From: backdev-1 Date: Mon, 15 Jun 2026 11:15:50 +0700 Subject: [PATCH] Add monitoring with another system --- .../monitoring/MonitoringSearchService.java | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/main/java/ru/soune/nocopy/service/monitoring/MonitoringSearchService.java b/src/main/java/ru/soune/nocopy/service/monitoring/MonitoringSearchService.java index 275b10d..62ee9b2 100644 --- a/src/main/java/ru/soune/nocopy/service/monitoring/MonitoringSearchService.java +++ b/src/main/java/ru/soune/nocopy/service/monitoring/MonitoringSearchService.java @@ -90,7 +90,7 @@ public class MonitoringSearchService { } catch (IOException e) { log.error("Error processing monitoring search", e); monitoring.setLastRunStatus("ERROR: " + e.getMessage()); - updateNextRun(monitoring); + monitoring.setNextRun(calculateNextRun(monitoringType)); monitoringRepository.save(monitoring); @@ -118,7 +118,7 @@ public class MonitoringSearchService { } catch (IOException e) { log.error("Error processing monitoring search", e); monitoring.setLastRunStatus("ERROR: " + e.getMessage()); - updateNextRun(monitoring); + monitoring.setNextRun(calculateNextRun(monitoringType)); monitoringRepository.save(monitoring); @@ -137,7 +137,7 @@ public class MonitoringSearchService { } monitoring.setLastRunStatus("SUCCESS"); - updateNextRun(monitoring); + monitoring.setNextRun(calculateNextRun(monitoringType)); monitoringRepository.save(monitoring); } catch (TariffNotFoundException e) { TariffInfo activeTariffInfo = user.getActiveTariffInfo(); @@ -147,7 +147,7 @@ public class MonitoringSearchService { monitoring.setLastRunStatus("ERROR: " + e.getMessage()); - updateNextRun(monitoring); + monitoring.setNextRun(calculateNextRun(monitoringType)); monitoringRepository.save(monitoring); @@ -163,7 +163,7 @@ public class MonitoringSearchService { } catch (Exception e) { log.error("Error processing monitoring search", e); monitoring.setLastRunStatus("ERROR: " + e.getMessage()); - updateNextRun(monitoring); + monitoring.setNextRun(calculateNextRun(monitoringType)); monitoringRepository.save(monitoring); @@ -179,11 +179,6 @@ public class MonitoringSearchService { } } - private void updateNextRun(FileMonitoringEntity monitoring) { - LocalDateTime nextRun = calculateNextRun(monitoring.getMonitoringType()); - monitoring.setNextRun(nextRun); - } - private LocalDateTime calculateNextRun(MonitoringType type) { LocalDateTime now = LocalDateTime.now(); LocalDateTime nextRun = now.withHour(2).withMinute(0).withSecond(0).withNano(0);