From 284b402cdc7cef3602eda83925e153608e5b89e1 Mon Sep 17 00:00:00 2001 From: backdev-1 Date: Tue, 28 Apr 2026 14:15:29 +0700 Subject: [PATCH] dev fix add count --- .../ViolationStatisticsResponse.java | 4 +- .../repository/ComplaintEntityRepository.java | 2 +- .../nocopy/repository/LawCaseRepository.java | 2 +- .../service/violation/ViolationService.java | 44 ++++++++++++++++--- 4 files changed, 42 insertions(+), 10 deletions(-) diff --git a/src/main/java/ru/soune/nocopy/dto/violation/ViolationStatisticsResponse.java b/src/main/java/ru/soune/nocopy/dto/violation/ViolationStatisticsResponse.java index fa36d39..49a32f3 100644 --- a/src/main/java/ru/soune/nocopy/dto/violation/ViolationStatisticsResponse.java +++ b/src/main/java/ru/soune/nocopy/dto/violation/ViolationStatisticsResponse.java @@ -15,10 +15,10 @@ public class ViolationStatisticsResponse { private long newViolations; @JsonProperty("total_complaints") - private int totalComplaints; + private Long totalComplaints; @JsonProperty("total_law_cases") - private int totalLawCases; + private Long totalLawCases; @JsonProperty("in_progress_violations") private long inProgressViolations; diff --git a/src/main/java/ru/soune/nocopy/repository/ComplaintEntityRepository.java b/src/main/java/ru/soune/nocopy/repository/ComplaintEntityRepository.java index 762c946..662e0a9 100644 --- a/src/main/java/ru/soune/nocopy/repository/ComplaintEntityRepository.java +++ b/src/main/java/ru/soune/nocopy/repository/ComplaintEntityRepository.java @@ -42,7 +42,7 @@ public interface ComplaintEntityRepository extends JpaRepository violations); + Long countComplaintByViolations(@Param("violations") List violations); @Query("SELECT c FROM ComplaintEntity c WHERE c.email IN :emails") Page getComplaintsByUserEmails(@Param("emails") List emails, Pageable pageable); diff --git a/src/main/java/ru/soune/nocopy/repository/LawCaseRepository.java b/src/main/java/ru/soune/nocopy/repository/LawCaseRepository.java index 8777583..87ffefd 100644 --- a/src/main/java/ru/soune/nocopy/repository/LawCaseRepository.java +++ b/src/main/java/ru/soune/nocopy/repository/LawCaseRepository.java @@ -45,7 +45,7 @@ public interface LawCaseRepository extends JpaRepository { Long getTotalLawCasesCount(); @Query("SELECT COUNT(l) FROM LawCase l WHERE l.violationId IN :violationIds") - int countLawCaseByViolationIds(@Param("violationIds") List violationIds); + Long countLawCaseByViolationIds(@Param("violationIds") List violationIds); Optional getLawCaseByViolationIdAndType(Long violationId, LawCaseType type); } diff --git a/src/main/java/ru/soune/nocopy/service/violation/ViolationService.java b/src/main/java/ru/soune/nocopy/service/violation/ViolationService.java index 1180589..02c61d2 100644 --- a/src/main/java/ru/soune/nocopy/service/violation/ViolationService.java +++ b/src/main/java/ru/soune/nocopy/service/violation/ViolationService.java @@ -1,6 +1,7 @@ package ru.soune.nocopy.service.violation; import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.codec.digest.DigestUtils; import org.springframework.data.domain.*; import org.springframework.stereotype.Service; @@ -24,6 +25,7 @@ import java.util.stream.Collectors; @Service @AllArgsConstructor +@Slf4j public class ViolationService { private final ViolationRepository violationRepository; @@ -220,11 +222,25 @@ public class ViolationService { Set inProgressStatuses = Set.of( ViolationStatus.LEGAL_IN_WORK.name(), ViolationStatus.COMPLAINT_IN_WORK.name(), - ViolationStatus.COMPLAINT_AND_LEGAL_IN_WORK.name() - ); + ViolationStatus.COMPLAINT_AND_LEGAL_IN_WORK.name()); List violationIds = violations.stream().map(Violation::getId).toList(); - + log.info("!!!!!!!!!!!!!!!!!!!!!!!!!"); + log.info("!!!!!!!!!!!!!!!!!!!!!!!!!"); + log.info("!!!!!!!!!!!!!!!!!!!!!!!!!"); + log.info("!!!!!!!!!!!!!!!!!!!!!!!!!"); + log.info("!!!!!!!!!!!!!!!!!!!!!!!!!"); + log.info("!!!!!!!!!!!!!!!!!!!!!!!!!"); + log.info("!!!!!!!!!!!!!!!!!!!!!!!!! Violations ids: " + violationIds); + log.info("!!!!!!!!!!!!!!!!!!!!!!!!!"); + log.info("!!!!!!!!!!!!!!!!!!!!!!!!!"); + log.info("!!!!!!!!!!!!!!!!!!!!!!!!!"); + log.info("!!!!!!!!!!!!!!!!!!!!!!!!!"); + log.info("!!!!!!!!!!!!!!!!!!!!!!!!!"); + log.info("!!!!!!!!!!!!!!!!!!!!!!!!!"); + log.info("!!!!!!!!!!!!!!!!!!!!!!!!!"); + log.info("!!!!!!!!!!!!!!!!!!!!!!!!!"); + log.info("!!!!!!!!!!!!!!!!!!!!!!!!!"); long newViolations = violations.stream() .filter(v -> v.getStatus().equals(ViolationStatus.NEW.name())) .count(); @@ -237,14 +253,30 @@ public class ViolationService { .filter(v -> v.getStatus().equals(ViolationStatus.AUTHORIZED_USE.name())) .count(); - int totalComplaints = 0; - int totalLawCases = 0; + Long totalComplaints = 0L; + Long totalLawCases = 0L; if (!violationIds.isEmpty()) { totalComplaints = complaintRepository.countComplaintByViolations(violationIds); totalLawCases = lawCaseRepository.countLawCaseByViolationIds(violationIds); } - + log.info("!!!!!!!!!!!!!!!!!!!!!!!!!"); + log.info("!!!!!!!!!!!!!!!!!!!!!!!!!"); + log.info("!!!!!!!!!!!!!!!!!!!!!!!!!"); + log.info("!!!!!!!!!!!!!!!!!!!!!!!!!"); + log.info("!!!!!!!!!!!!!!!!!!!!!!!!!"); + log.info("!!!!!!!!!!!!!!!!!!!!!!!!!"); + log.info("!!!!!!!!!!!!!!!!!!!!!!!!! totalLawCases: " + totalLawCases); + log.info("!!!!!!!!!!!!!!!!!!!!!!!!! totalComplaints: " + totalComplaints); + log.info("!!!!!!!!!!!!!!!!!!!!!!!!!"); + log.info("!!!!!!!!!!!!!!!!!!!!!!!!!"); + log.info("!!!!!!!!!!!!!!!!!!!!!!!!!"); + log.info("!!!!!!!!!!!!!!!!!!!!!!!!!"); + log.info("!!!!!!!!!!!!!!!!!!!!!!!!!"); + log.info("!!!!!!!!!!!!!!!!!!!!!!!!!"); + log.info("!!!!!!!!!!!!!!!!!!!!!!!!!"); + log.info("!!!!!!!!!!!!!!!!!!!!!!!!!"); + log.info("!!!!!!!!!!!!!!!!!!!!!!!!!"); return ViolationStatisticsResponse.builder() .totalViolations(violations.size()) .newViolations(newViolations)