From acceaa55fcd46c97d76b6e8322b7774fa59e5c4a Mon Sep 17 00:00:00 2001 From: backdev-1 Date: Thu, 11 Jun 2026 18:56:47 +0700 Subject: [PATCH] Add monitoring with another system --- .../monitoring/MonitoringSearchService.java | 65 +------------------ 1 file changed, 1 insertion(+), 64 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 33a1065..275b10d 100644 --- a/src/main/java/ru/soune/nocopy/service/monitoring/MonitoringSearchService.java +++ b/src/main/java/ru/soune/nocopy/service/monitoring/MonitoringSearchService.java @@ -6,12 +6,10 @@ import jakarta.mail.MessagingException; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.MessageSource; import org.springframework.kafka.core.KafkaTemplate; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import ru.soune.nocopy.configuration.search.SearchProperties; -import ru.soune.nocopy.dto.file.YandexSearchResponse; import ru.soune.nocopy.dto.monitoring.MonitoringDTO; import ru.soune.nocopy.dto.tarriff.TariffDTO; import ru.soune.nocopy.entity.monitoring.FileMonitoringEntity; @@ -26,25 +24,18 @@ import ru.soune.nocopy.repository.FileMonitoringRepository; import ru.soune.nocopy.repository.UserRepository; import ru.soune.nocopy.service.mail.EmailService; import ru.soune.nocopy.service.notification.NotificationService; -import ru.soune.nocopy.service.search.SearchImageService; import ru.soune.nocopy.service.tariff.TariffInfoService; import ru.soune.nocopy.service.tariff.TariffService; -import ru.soune.nocopy.service.violation.ViolationService; import java.io.IOException; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; -import java.util.ArrayList; -import java.util.List; import java.util.Objects; -import java.util.concurrent.TimeoutException; @Slf4j @Service @RequiredArgsConstructor public class MonitoringSearchService { - private final SearchImageService searchImageService; - private final FileMonitoringRepository monitoringRepository; private final TariffInfoService tariffInfoService; @@ -55,8 +46,6 @@ public class MonitoringSearchService { private final UserRepository userRepository; - private final ViolationService violationService; - private final SearchProperties searchProperties; private final NotificationService notificationService; @@ -68,22 +57,6 @@ public class MonitoringSearchService { @Value("${server.baseurl}") private String baseUrl; - // MonitoringDTO monitoringGoogleDTO = MonitoringDTO.builder().baseUrl(baseUrl). - // fileId(monitoring.getFile().getId()) - // .engine("google_lens") - // .searchType("exact_matches") - // .build(); - // - // kafkaTemplate.send("monitoring-commands", objectMapper.writeValueAsString(monitoringGoogleDTO)); - // - // MonitoringDTO monitoringYandexDTO = MonitoringDTO.builder().baseUrl(baseUrl). - // fileId(monitoring.getFile().getId()) - // .engine("yandex_reverse_image") - // .searchType("visual_matches") - // .build(); - // - // kafkaTemplate.send("monitoring-commands", objectMapper.writeValueAsString(monitoringYandexDTO)); - @Transactional(noRollbackFor = TariffNotFoundException.class) public void processFileSearch(FileMonitoringEntity monitoring) throws MessagingException, IOException { monitoring.setLastRun(LocalDateTime.now()); @@ -105,18 +78,8 @@ public class MonitoringSearchService { log.info("Monitoring search settings: useYandex={}, useGoogle={}", useYandex, useGoogle); -// List allResults = new ArrayList<>(); - if (useYandex) { try { -// String yandexResponse = searchImageService.searchReverseByPublicUrl( -// monitoring.getFile(), "yandex_reverse_image", "visual_matches"); -// -// List yandexImages = -// searchImageService.getAllImagesWithoutPagination(yandexResponse, "visual_matches"); -// -// allResults.addAll(yandexImages); -// log.info("Yandex search found {} results", yandexImages.size()); MonitoringDTO monitoringYandexDTO = MonitoringDTO.builder().baseUrl(baseUrl). fileId(monitoring.getFile().getId()) .engine("yandex_reverse_image") @@ -145,15 +108,6 @@ public class MonitoringSearchService { if (useGoogle) { try { -// String googleResponse = searchImageService.searchReverseByPublicUrl( -// monitoring.getFile(), "google_lens", "exact_matches"); -// -// List googleImages = -// searchImageService.getAllImagesWithoutPagination(googleResponse, -// "exact_matches"); -// -// allResults.addAll(googleImages); -// log.info("Google search found {} results", googleImages.size()); MonitoringDTO monitoringGoogleDTO = MonitoringDTO.builder().baseUrl(baseUrl). fileId(monitoring.getFile().getId()) .engine("google_lens") @@ -182,26 +136,9 @@ public class MonitoringSearchService { log.info("Google search is disabled by settings"); } -// List uniqueResults = allResults; -// if (useYandex && useGoogle) { -// uniqueResults = searchImageService.removeDuplicateUrls( -// useYandex ? allResults : new ArrayList<>(), -// useGoogle ? allResults : new ArrayList<>() -// ); -// log.info("After deduplication: {} unique results", uniqueResults.size()); -// } - -// for (YandexSearchResponse.ImageResult imageResult : uniqueResults) { -// violationService.processViolation(imageResult, monitoring.getFile(), null); -// } - -// monitoring.setLastRunStatus("SUCCESS"); + monitoring.setLastRunStatus("SUCCESS"); updateNextRun(monitoring); monitoringRepository.save(monitoring); -// if (uniqueResults.isEmpty()) { -// log.info("No results found for monitoring file {}", monitoring.getFile().getId()); -// } - } catch (TariffNotFoundException e) { TariffInfo activeTariffInfo = user.getActiveTariffInfo(); int currentTokens = activeTariffInfo.getTokens() + activeTariffInfo.getBoughtTokens();