diff --git a/src/main/java/ru/nbch/credit_tracker/builder/PersonFactoryBuilder.java b/src/main/java/ru/nbch/credit_tracker/builder/PersonFactoryBuilder.java index 2bc69dd..55ecaae 100644 --- a/src/main/java/ru/nbch/credit_tracker/builder/PersonFactoryBuilder.java +++ b/src/main/java/ru/nbch/credit_tracker/builder/PersonFactoryBuilder.java @@ -30,7 +30,7 @@ public class PersonFactoryBuilder { private PersonService.PersonData personData; - private Integer uid; + private Long uid; public static PersonFactoryBuilder builder() { return new PersonFactoryBuilder(); @@ -41,7 +41,7 @@ public class PersonFactoryBuilder { return this; } - public PersonFactoryBuilder uid(Integer uid) { + public PersonFactoryBuilder uid(Long uid) { this.uid = uid; return this; } diff --git a/src/main/java/ru/nbch/credit_tracker/entities/dto/Hit.java b/src/main/java/ru/nbch/credit_tracker/entities/dto/Hit.java index 0b46bb8..e0ed9af 100644 --- a/src/main/java/ru/nbch/credit_tracker/entities/dto/Hit.java +++ b/src/main/java/ru/nbch/credit_tracker/entities/dto/Hit.java @@ -8,8 +8,8 @@ import java.time.LocalDateTime; @Getter @Setter public class Hit { - private Integer id; - private Integer packageId; + private Long id; + private Long packageId; private String subjectId; private Integer signalType; private LocalDateTime responseSentAt; diff --git a/src/main/java/ru/nbch/credit_tracker/entities/dto/PhoneFidMap.java b/src/main/java/ru/nbch/credit_tracker/entities/dto/PhoneFidMap.java index 0ed7836..0186a49 100644 --- a/src/main/java/ru/nbch/credit_tracker/entities/dto/PhoneFidMap.java +++ b/src/main/java/ru/nbch/credit_tracker/entities/dto/PhoneFidMap.java @@ -10,8 +10,8 @@ import java.time.LocalDateTime; @NoArgsConstructor @Builder public class PhoneFidMap { - private Integer id; - private Integer packageId; + private Long id; + private Long packageId; private String subjectId; private String phone; private Integer fid; diff --git a/src/main/java/ru/nbch/credit_tracker/entities/dto/UserPackage.java b/src/main/java/ru/nbch/credit_tracker/entities/dto/UserPackage.java index eaf0665..9f7db86 100644 --- a/src/main/java/ru/nbch/credit_tracker/entities/dto/UserPackage.java +++ b/src/main/java/ru/nbch/credit_tracker/entities/dto/UserPackage.java @@ -10,7 +10,7 @@ import java.time.LocalDateTime; @Setter @Builder public class UserPackage { - private Integer id; + private Long id; private String userId; private String packageName; private LocalDateTime createdAt; diff --git a/src/main/java/ru/nbch/credit_tracker/entities/external_request/signals/Person.java b/src/main/java/ru/nbch/credit_tracker/entities/external_request/signals/Person.java index e3f09e4..06b6fc5 100644 --- a/src/main/java/ru/nbch/credit_tracker/entities/external_request/signals/Person.java +++ b/src/main/java/ru/nbch/credit_tracker/entities/external_request/signals/Person.java @@ -15,7 +15,7 @@ public class Person { @XmlValue protected String value; @XmlAttribute(name = "uid", required = true) - protected Integer uid; + protected Long uid; @XmlAttribute(name = "oksm", required = true) protected String oksm; @XmlAttribute(name = "s", required = true) diff --git a/src/main/java/ru/nbch/credit_tracker/entities/external_response/monitoring_report_error/MonitoringReportErrors.java b/src/main/java/ru/nbch/credit_tracker/entities/external_response/monitoring_report_error/MonitoringReportErrors.java index 690577c..146e42f 100644 --- a/src/main/java/ru/nbch/credit_tracker/entities/external_response/monitoring_report_error/MonitoringReportErrors.java +++ b/src/main/java/ru/nbch/credit_tracker/entities/external_response/monitoring_report_error/MonitoringReportErrors.java @@ -63,7 +63,7 @@ public class MonitoringReportErrors { public static class P { @XmlAttribute(name = "uid") - protected Integer uid; + protected Long uid; @XmlValue protected String value; diff --git a/src/main/java/ru/nbch/credit_tracker/entities/external_response/online_download/Person.java b/src/main/java/ru/nbch/credit_tracker/entities/external_response/online_download/Person.java index 7b83f53..7012472 100644 --- a/src/main/java/ru/nbch/credit_tracker/entities/external_response/online_download/Person.java +++ b/src/main/java/ru/nbch/credit_tracker/entities/external_response/online_download/Person.java @@ -16,7 +16,7 @@ import java.util.List; public class Person { @XmlAttribute(name = "uid", required = true) - protected Integer uid; + protected Long uid; @XmlElement(name = "Inquiry", required = true) protected List inquiries; diff --git a/src/main/java/ru/nbch/credit_tracker/facade/SignalFacade.java b/src/main/java/ru/nbch/credit_tracker/facade/SignalFacade.java index 3afb7a4..b44a1c6 100644 --- a/src/main/java/ru/nbch/credit_tracker/facade/SignalFacade.java +++ b/src/main/java/ru/nbch/credit_tracker/facade/SignalFacade.java @@ -103,7 +103,7 @@ public class SignalFacade { // Валидация Архива на количетсво файлов, размер и расширение MonitoringRequest monitoringRequest; - Integer packageId; + Long packageId; ZipInputStream zipInputStream = null; String filePath; try { @@ -224,7 +224,7 @@ public class SignalFacade { } @SetAndClearMdc(argIndex = 1) - public void registerFidsAndDebts(Integer packageId, String packageName, String filePath) { + public void registerFidsAndDebts(Long packageId, String packageName, String filePath) { Map context = MDC.getCopyOfContextMap(); executor.execute(() -> { if (context != null) { diff --git a/src/main/java/ru/nbch/credit_tracker/mapper/signal/PhoneFidMapMapper.java b/src/main/java/ru/nbch/credit_tracker/mapper/signal/PhoneFidMapMapper.java index 0e42995..baa721f 100644 --- a/src/main/java/ru/nbch/credit_tracker/mapper/signal/PhoneFidMapMapper.java +++ b/src/main/java/ru/nbch/credit_tracker/mapper/signal/PhoneFidMapMapper.java @@ -10,15 +10,15 @@ import java.util.List; @Mapper public interface PhoneFidMapMapper { - void registerSubjects(@Param("subjects") List subjects, @Param("packageId") Integer packageId); + void registerSubjects(@Param("subjects") List subjects, @Param("packageId") Long packageId); - List findFullPhoneFidMap(@Param("packageId") Integer packageId, @Param("offset") int offset, @Param("limit") int limit); + List findFullPhoneFidMap(@Param("packageId") Long packageId, @Param("offset") int offset, @Param("limit") int limit); void updatePhoneFidMaps(@Param("subjects") List subjects); void updatePhoneFidMapsErrors(@Param("subjects") List subjects); - PhoneFidMap findPhoneFidMapById(@Param("id") Integer packageId); + PhoneFidMap findPhoneFidMapById(@Param("id") Long packageId); - boolean hasNonNullFids(@Param("packageId") Integer packageId); + boolean hasNonNullFids(@Param("packageId") Long packageId); } diff --git a/src/main/java/ru/nbch/credit_tracker/mapper/signal/UserPackageMapper.java b/src/main/java/ru/nbch/credit_tracker/mapper/signal/UserPackageMapper.java index 73dda8f..e2f8b46 100644 --- a/src/main/java/ru/nbch/credit_tracker/mapper/signal/UserPackageMapper.java +++ b/src/main/java/ru/nbch/credit_tracker/mapper/signal/UserPackageMapper.java @@ -18,15 +18,15 @@ public interface UserPackageMapper { void deletePackage(@Param("userId") String userId, @Param("packageName") String packageName, @Param("status") String newStatus, @Param("previousStatus") String previousStatus, @Param("deactivatedAt") LocalDateTime deactivatedAt); - Integer insertPackage(@Param("userPackage") UserPackage userPackage); + Long insertPackage(@Param("userPackage") UserPackage userPackage); - void updatePackageStatus(@Param("packageId") Integer packageId, @Param("status") String status); + void updatePackageStatus(@Param("packageId") Long packageId, @Param("status") String status); - void updatePackageLastDownloadedReport(@Param("id") Integer id, @Param("fileName") String fileName); + void updatePackageLastDownloadedReport(@Param("id") Long id, @Param("fileName") String fileName); - void updatePackageOnMonitoringSuccess(@Param("id")Integer id, @Param("monitoringAt") LocalDateTime monitoringAt); + void updatePackageOnMonitoringSuccess(@Param("id") Long id, @Param("monitoringAt") LocalDateTime monitoringAt); - UserPackage findPackage(@Param("id") Integer id); + UserPackage findPackage(@Param("id") Long id); List findUserPackages(@Param("userId") String userId, @Param("statuses") List status); diff --git a/src/main/java/ru/nbch/credit_tracker/service/MonitoringErrorProcesingService.java b/src/main/java/ru/nbch/credit_tracker/service/MonitoringErrorProcesingService.java index 74bd9d1..edd41d4 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/MonitoringErrorProcesingService.java +++ b/src/main/java/ru/nbch/credit_tracker/service/MonitoringErrorProcesingService.java @@ -25,13 +25,13 @@ public class MonitoringErrorProcesingService { this.signalRestService = signalRestService; } - public void findErrors(Integer packageId) { + public void findErrors(Long packageId) { UserPackage userPackage = signalService.findPackage(packageId); getCurrentProxy().processPackage(userPackage, packageId); } @SetAndClearMdc - public void processPackage(UserPackage userPackage, Integer packageId) { + public void processPackage(UserPackage userPackage, Long packageId) { if (userPackage != null) { String packCode = userPackage.getUserId().substring(0, 6) + "_" + userPackage.getPackageName(); log.info("Проверка на ошибки при постановке на мониторинг. packCode={}, packageId={}", packCode, packageId); diff --git a/src/main/java/ru/nbch/credit_tracker/service/MonitoringService.java b/src/main/java/ru/nbch/credit_tracker/service/MonitoringService.java index 07c5a10..6d17ba4 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/MonitoringService.java +++ b/src/main/java/ru/nbch/credit_tracker/service/MonitoringService.java @@ -312,7 +312,7 @@ public class MonitoringService { log.info("Signal hits updated for package {}", userPackage.getPackageName()); } - public String loadReport(Integer packageId, String reportName) { + public String loadReport(Long packageId, String reportName) { return signalRestService.downloadReport(packageId, reportName); } diff --git a/src/main/java/ru/nbch/credit_tracker/service/SignalService.java b/src/main/java/ru/nbch/credit_tracker/service/SignalService.java index 010a5bf..d44f13e 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/SignalService.java +++ b/src/main/java/ru/nbch/credit_tracker/service/SignalService.java @@ -72,7 +72,7 @@ public class SignalService { return userPackageService.isPackageNotUnique(request.getUserId(), request.getPackageName()); } - public Integer registerPackage(MonitoringRequest request) { + public Long registerPackage(MonitoringRequest request) { UserPackage userPackage = UserPackage.builder() .userId(request.getUserId()) .packageName(request.getPackageName()) @@ -82,7 +82,7 @@ public class SignalService { return userPackageService.insertPackage(userPackage); } - public void registerSubjects(String filePath, Integer packageId) { + public void registerSubjects(String filePath, Long packageId) { log.info("Start registering subjects. PackageId: {}", packageId); try (BufferedInputStream in = new BufferedInputStream(Files.newInputStream(Path.of(filePath)), 8 * 1024 * 1024)) { staxXmlProcessor.read(in, MonitoringRequest.class, @@ -105,7 +105,7 @@ public class SignalService { /** * Обрабатывает все PhoneFidMap по packageId, выгружая их пачками и фильтруя по переданному фильтру */ - public UpdateResult updateSubjects(Integer packageId, Predicate filter) { + public UpdateResult updateSubjects(Long packageId, Predicate filter) { boolean updated = false; boolean noFidsFound = true; int offset = 0; @@ -141,7 +141,7 @@ public class SignalService { * Обрабатывает пачку PhoneFidMap: обновляет фиды и флаги просрочек * @return fidsFound true - если хотя бы по одному номеру был найден фид, false - в противном случае */ - public boolean updateFlags(List subjects, Integer packageId) { + public boolean updateFlags(List subjects, Long packageId) { log.info("Start calculating fids and flags for subjects batch. PackageId: {}", packageId); Map fidsMap = phoneService.findFidsPhoneData(subjects); LocalDateTime calculatedAt = LocalDateTime.now(); @@ -197,11 +197,11 @@ public class SignalService { userPackageService.insertPackage(userPackage); } - public void updatePackageStatus(Integer packageId, Status status) { + public void updatePackageStatus(Long packageId, Status status) { userPackageService.updatePackageStatus(packageId, status); } - public void updatePackageOnMonitoringSuccess(Integer packageId, LocalDateTime monitoringAt) { + public void updatePackageOnMonitoringSuccess(Long packageId, LocalDateTime monitoringAt) { userPackageService.updatePackageOnMonitoringSuccess(packageId, monitoringAt); } @@ -210,7 +210,7 @@ public class SignalService { * * @return Путь к файлу запроса к официальному сервису сигналов на постановку на мониторинг */ - public String writeSignals(Integer packageId) { + public String writeSignals(Long packageId) { String folderPath = config.getLoadDir() + File.separator + "tmp_folder" + File.separator; String filePath = folderPath + UUID.randomUUID() + "_output.xml"; CTUtil.createFolder(folderPath); @@ -226,7 +226,7 @@ public class SignalService { return filePath; } - private Signals buildSignals(Integer packageId) { + private Signals buildSignals(Long packageId) { UserPackage userPackage = userPackageService.findPackage(packageId); Signals signals = new Signals(); signals.setOnline("2"); // Всегда=2 (только онлайн-сигналы) @@ -242,7 +242,7 @@ public class SignalService { * Обрабатывает все PhoneFidMap по packageId, выгружая их пачками и фильтруя по переданному фильтру. * writer записывает пачку сразу в файл */ - private void buildPersons(Integer packageId, Consumer> writer) { + private void buildPersons(Long packageId, Consumer> writer) { int offset = 0; List batch; do { @@ -282,7 +282,7 @@ public class SignalService { return persons; } - public void updateSubjectsErrors(String filePath, Integer packageId) { + public void updateSubjectsErrors(String filePath, Long packageId) { log.info("Start updating subjects errors. PackageId: {}", packageId); try (BufferedInputStream in = new BufferedInputStream(Files.newInputStream(Path.of(filePath)), 8 * 1024 * 1024)) { staxXmlProcessor.read(in, MonitoringReportErrors.class, @@ -341,19 +341,19 @@ public class SignalService { hitsService.insertHits(hits); } - public void updateLastDownloadedReport(Integer id, String fileName) { + public void updateLastDownloadedReport(Long id, String fileName) { userPackageService.updatePackageLastDownloadedReport(id, fileName); } - public PhoneFidMap findPhoneFidMapById(Integer id) { + public PhoneFidMap findPhoneFidMapById(Long id) { return phoneFidMapService.findPhoneFidMapById(id); } - public boolean hasNonNullfids(Integer packageId) { + public boolean hasNonNullfids(Long packageId) { return phoneFidMapService.hasNonNullfids(packageId); } - public UserPackage findPackage(Integer packageId) { + public UserPackage findPackage(Long packageId) { return userPackageService.findPackage(packageId); } diff --git a/src/main/java/ru/nbch/credit_tracker/service/UpdateProcessingPackagesService.java b/src/main/java/ru/nbch/credit_tracker/service/UpdateProcessingPackagesService.java index 1ca26c7..81506d5 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/UpdateProcessingPackagesService.java +++ b/src/main/java/ru/nbch/credit_tracker/service/UpdateProcessingPackagesService.java @@ -45,7 +45,7 @@ public class UpdateProcessingPackagesService { } @SetAndClearMdc(argIndex = 1) - public void process(Integer packageId, String packageName) { + public void process(Long packageId, String packageName) { try { SignalService.UpdateResult updateResult = signalService.updateSubjects(packageId, null); if (updateResult.isNoFidsFound()) { diff --git a/src/main/java/ru/nbch/credit_tracker/service/UpdatingFlagsService.java b/src/main/java/ru/nbch/credit_tracker/service/UpdatingFlagsService.java index f9874a3..a62e62e 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/UpdatingFlagsService.java +++ b/src/main/java/ru/nbch/credit_tracker/service/UpdatingFlagsService.java @@ -61,7 +61,7 @@ public class UpdatingFlagsService { } private void updateFlags(UserPackage userPackage) { - Integer packageId = userPackage.getId(); + Long packageId = userPackage.getId(); String packageName = userPackage.getPackageName(); try { signalService.updatePackageStatus(packageId, Status.PROCESSING); diff --git a/src/main/java/ru/nbch/credit_tracker/service/signal/PhoneFidMapService.java b/src/main/java/ru/nbch/credit_tracker/service/signal/PhoneFidMapService.java index fd39166..bcf57d7 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/signal/PhoneFidMapService.java +++ b/src/main/java/ru/nbch/credit_tracker/service/signal/PhoneFidMapService.java @@ -16,11 +16,11 @@ public class PhoneFidMapService { this.mapper = mapper; } - public void registerSubjects(List subjects, Integer packageId) { + public void registerSubjects(List subjects, Long packageId) { mapper.registerSubjects(subjects, packageId); } - public List findFullPhoneFidMap(Integer packageId, int offset, int limit) { + public List findFullPhoneFidMap(Long packageId, int offset, int limit) { return mapper.findFullPhoneFidMap(packageId, offset, limit); } @@ -32,11 +32,11 @@ public class PhoneFidMapService { mapper.updatePhoneFidMapsErrors(subjects); } - public PhoneFidMap findPhoneFidMapById(Integer id) { + public PhoneFidMap findPhoneFidMapById(Long id) { return mapper.findPhoneFidMapById(id); } - public boolean hasNonNullfids(Integer packageId) { + public boolean hasNonNullfids(Long packageId) { return mapper.hasNonNullFids(packageId); } } diff --git a/src/main/java/ru/nbch/credit_tracker/service/signal/SignalRestService.java b/src/main/java/ru/nbch/credit_tracker/service/signal/SignalRestService.java index 2d30db2..ad08a0f 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/signal/SignalRestService.java +++ b/src/main/java/ru/nbch/credit_tracker/service/signal/SignalRestService.java @@ -68,7 +68,7 @@ public class SignalRestService { * Ставит пакет на мониторинг в официальный сервис сигналов * @return true - если пакет успешно поставился на мониторинг. false - в противном случае */ - public boolean setupMonitoring(Integer packageId) throws Exception { + public boolean setupMonitoring(Long packageId) throws Exception { String path = signalService.writeSignals(packageId); Resource request = compressFile(path); @@ -105,7 +105,7 @@ public class SignalRestService { /** * @return имя файла с ошибками по поставленному на мониторинг отчету */ - public String getErrorFileName(Integer packageId, String packCode) { + public String getErrorFileName(Long packageId, String packCode) { String url = GET_REPORT_URI + "?packCode=" + packCode; HttpHeaders headers = new HttpHeaders(); @@ -148,7 +148,7 @@ public class SignalRestService { * * @return путь к разархивированному файлу. Пример: /tmp_folder//0001XX_MY_BATCH_223112.1.errors.xml.gz */ - public String loadErrorFile(Integer packageId, String fileName) { + public String loadErrorFile(Long packageId, String fileName) { String url = DOWNLOAD_REPORT_URI + "?fNameRequest=" + fileName; HttpHeaders headers = new HttpHeaders(); @@ -229,7 +229,7 @@ public class SignalRestService { * * @return путь к разархивированному файлу. Пример: /tmp_folder//0001XX_MY_BATCH_204.1.online.2025-07-08T20-00-46.xml.gz.xml */ - public String downloadReport(Integer packageId, String reportName) { + public String downloadReport(Long packageId, String reportName) { String url = DOWNLOAD_ONLINE_REPORT_URI + "?fNameReport=" + reportName; HttpHeaders headers = new HttpHeaders(); @@ -247,7 +247,7 @@ public class SignalRestService { return unzipReport(response,packageId, reportName); } - private String unzipReport(ResponseEntity response, Integer packageId, String reportName) { + private String unzipReport(ResponseEntity response, Long packageId, String reportName) { boolean isGzipped = response.getHeaders().getContentType() != null && response.getHeaders().getContentType().toString().equals("application/x-gzip"); diff --git a/src/main/java/ru/nbch/credit_tracker/service/signal/UserPackageService.java b/src/main/java/ru/nbch/credit_tracker/service/signal/UserPackageService.java index a390521..b38ec4c 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/signal/UserPackageService.java +++ b/src/main/java/ru/nbch/credit_tracker/service/signal/UserPackageService.java @@ -34,23 +34,23 @@ public class UserPackageService { mapper.deletePackage(userId.substring(0, 6), packageName, newStatus.name(), previousStatus.name(), deactivatedAt); } - public Integer insertPackage(UserPackage userPackage) { + public Long insertPackage(UserPackage userPackage) { return mapper.insertPackage(userPackage); } - public void updatePackageStatus(Integer packageId, Status status) { + public void updatePackageStatus(Long packageId, Status status) { mapper.updatePackageStatus(packageId, status.name()); } - public void updatePackageLastDownloadedReport(Integer id, String fileName) { + public void updatePackageLastDownloadedReport(Long id, String fileName) { mapper.updatePackageLastDownloadedReport(id, fileName); } - public void updatePackageOnMonitoringSuccess(Integer id, LocalDateTime monitoringAt) { + public void updatePackageOnMonitoringSuccess(Long id, LocalDateTime monitoringAt) { mapper.updatePackageOnMonitoringSuccess(id, monitoringAt); } - public UserPackage findPackage(Integer id) { + public UserPackage findPackage(Long id) { return mapper.findPackage(id); } diff --git a/src/main/java/ru/nbch/credit_tracker/service/xml/stax/MonitoringReportErrorsStaxtReader.java b/src/main/java/ru/nbch/credit_tracker/service/xml/stax/MonitoringReportErrorsStaxtReader.java index eb5a703..18e3c2e 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/xml/stax/MonitoringReportErrorsStaxtReader.java +++ b/src/main/java/ru/nbch/credit_tracker/service/xml/stax/MonitoringReportErrorsStaxtReader.java @@ -55,7 +55,7 @@ public class MonitoringReportErrorsStaxtReader extends BaseStaxReader { try { - int uid = Integer.parseInt(text); + Long uid = Long.parseLong(text); obj.getCurrentPerson().setUid(uid); } catch (NumberFormatException e) { log.error("Couldn't parse uid: {}", text); diff --git a/src/main/java/ru/nbch/credit_tracker/service/xml/stax/OnlineDownloadReportPersonsStaxReader.java b/src/main/java/ru/nbch/credit_tracker/service/xml/stax/OnlineDownloadReportPersonsStaxReader.java index 1126573..8ad34f1 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/xml/stax/OnlineDownloadReportPersonsStaxReader.java +++ b/src/main/java/ru/nbch/credit_tracker/service/xml/stax/OnlineDownloadReportPersonsStaxReader.java @@ -46,7 +46,7 @@ public class OnlineDownloadReportPersonsStaxReader extends BaseStaxReader { try { - int uid = Integer.parseInt(text); + Long uid = Long.parseLong(text); obj.getCurrentPerson().setUid(uid); } catch (NumberFormatException e) { log.error("Couldn't parse uid: {}", text); diff --git a/src/main/resources/mybatis/mapper/signal/UserPackageMapper.xml b/src/main/resources/mybatis/mapper/signal/UserPackageMapper.xml index 7abd858..35de117 100644 --- a/src/main/resources/mybatis/mapper/signal/UserPackageMapper.xml +++ b/src/main/resources/mybatis/mapper/signal/UserPackageMapper.xml @@ -52,7 +52,7 @@ #{previousStatus} -