From 59e9de2684d12bb145bbe3115f0b2d3ed9b14999 Mon Sep 17 00:00:00 2001 From: backdev-1 Date: Thu, 14 May 2026 13:01:40 +0700 Subject: [PATCH] dev add field locale for get info for view doc --- .../java/ru/soune/nocopy/handler/DockViewFileHandler.java | 3 ++- .../ru/soune/nocopy/service/dockview/DockViewService.java | 4 ++-- .../java/ru/soune/nocopy/service/geo/GeoCountryService.java | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/ru/soune/nocopy/handler/DockViewFileHandler.java b/src/main/java/ru/soune/nocopy/handler/DockViewFileHandler.java index ccd5e5b..ffd695d 100644 --- a/src/main/java/ru/soune/nocopy/handler/DockViewFileHandler.java +++ b/src/main/java/ru/soune/nocopy/handler/DockViewFileHandler.java @@ -108,7 +108,8 @@ public class DockViewFileHandler implements RequestHandler { null); } - DockViewStatsResponse totalStats = dockViewService.getTotalStatsByFileIds(fileIds); + DockViewStatsResponse totalStats = dockViewService.getTotalStatsByFileIds(fileIds, + docViewerRequest.getLocale()); return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(), diff --git a/src/main/java/ru/soune/nocopy/service/dockview/DockViewService.java b/src/main/java/ru/soune/nocopy/service/dockview/DockViewService.java index 9e55066..20c1d22 100644 --- a/src/main/java/ru/soune/nocopy/service/dockview/DockViewService.java +++ b/src/main/java/ru/soune/nocopy/service/dockview/DockViewService.java @@ -53,10 +53,10 @@ public class DockViewService { return saved; } - public DockViewStatsResponse getTotalStatsByFileIds(List fileIds) { + public DockViewStatsResponse getTotalStatsByFileIds(List fileIds, String locale) { List statsList = dockViewRepository.findTotalViewsStatsByFileIds(fileIds); List allViewerIps = dockViewRepository.findAllViewerIps(fileIds); - Map uniqueGeoCount = geoCountryService.getUniqueGeoCount(allViewerIps); + Map uniqueGeoCount = geoCountryService.getUniqueGeoCount(allViewerIps, locale); if (statsList.isEmpty()) { return DockViewStatsResponse.builder() diff --git a/src/main/java/ru/soune/nocopy/service/geo/GeoCountryService.java b/src/main/java/ru/soune/nocopy/service/geo/GeoCountryService.java index 1ada4bb..6731a87 100644 --- a/src/main/java/ru/soune/nocopy/service/geo/GeoCountryService.java +++ b/src/main/java/ru/soune/nocopy/service/geo/GeoCountryService.java @@ -45,7 +45,7 @@ public class GeoCountryService { } } - public Map getUniqueGeoCount(List ipList) { + public Map getUniqueGeoCount(List ipList, String locale) { Set uniqueCountries = new HashSet<>(); Set uniqueCountryCodes = new HashSet<>(); Set uniqueCities = new HashSet<>(); @@ -53,7 +53,7 @@ public class GeoCountryService { if (ipList != null) { for (String ip : ipList) { try { - String country = getCountryByIp(ip); + String country = getCountryByIp(ip, locale); if (!"UNKNOWN".equals(country)) { uniqueCountries.add(country); } @@ -63,7 +63,7 @@ public class GeoCountryService { uniqueCountryCodes.add(countryCode); } - String city = getCityByIp(ip); + String city = getCityByIp(ip, locale); if (!"UNKNOWN".equals(city)) { uniqueCities.add(city); }