From 386ea4c18e774d17a3e88745da4b6c05857d21e5 Mon Sep 17 00:00:00 2001 From: Mikhail Trofimov Date: Thu, 16 Oct 2025 16:45:23 +0300 Subject: [PATCH] Fix after merging master --- pom.xml | 4 ++-- .../builder/PersonFactoryBuilderV2.java | 2 +- .../entities/dto/SubjectProfile.java | 2 +- .../credit_tracker/facade/SignalFacadeV2.java | 12 ++++++----- .../credit_tracker/model/FlagsPayload.java | 6 +++--- .../model/PackageToSavePayload.java | 6 +++--- .../credit_tracker/model/PartFilePayload.java | 9 ++++---- .../credit_tracker/model/PhoneFidPayload.java | 9 ++++---- .../model/PhoneFidPayloadV2.java | 9 ++++---- .../model/SubjectsProfilePayload.java | 9 ++++---- .../model/SubjectsProfilePayloadV2.java | 9 ++++---- .../service/task/FidIdEnricher.java | 19 +++++++---------- .../service/task/FidIdEnricherV2.java | 19 +++++++---------- .../service/task/PackageSaver.java | 21 ++++++++++--------- .../service/task/XmlMergeCoordinator.java | 2 +- 15 files changed, 70 insertions(+), 68 deletions(-) diff --git a/pom.xml b/pom.xml index 1599155..6cf15bc 100644 --- a/pom.xml +++ b/pom.xml @@ -10,12 +10,12 @@ ru.nbch credit-tracker - 1.20 + 2.0 credit_tracker Credit Tracker Application - 17 + 21 git_info git.properties 10.230.238.56:5000 diff --git a/src/main/java/ru/nbch/credit_tracker/builder/PersonFactoryBuilderV2.java b/src/main/java/ru/nbch/credit_tracker/builder/PersonFactoryBuilderV2.java index a29cf97..5dddf84 100644 --- a/src/main/java/ru/nbch/credit_tracker/builder/PersonFactoryBuilderV2.java +++ b/src/main/java/ru/nbch/credit_tracker/builder/PersonFactoryBuilderV2.java @@ -32,7 +32,7 @@ public class PersonFactoryBuilderV2 { private SubjectProfile personData; - private Integer uid; + private Long uid; public static PersonFactoryBuilderV2 builder() { return new PersonFactoryBuilderV2(); diff --git a/src/main/java/ru/nbch/credit_tracker/entities/dto/SubjectProfile.java b/src/main/java/ru/nbch/credit_tracker/entities/dto/SubjectProfile.java index 03aaeac..f2cfc37 100644 --- a/src/main/java/ru/nbch/credit_tracker/entities/dto/SubjectProfile.java +++ b/src/main/java/ru/nbch/credit_tracker/entities/dto/SubjectProfile.java @@ -6,7 +6,7 @@ import lombok.Setter; @Getter @Setter public class SubjectProfile { - private Integer id; + private Long id; private Integer fid; private IdProfile idProfile; private NameProfile nameProfile; diff --git a/src/main/java/ru/nbch/credit_tracker/facade/SignalFacadeV2.java b/src/main/java/ru/nbch/credit_tracker/facade/SignalFacadeV2.java index 446360a..588123b 100644 --- a/src/main/java/ru/nbch/credit_tracker/facade/SignalFacadeV2.java +++ b/src/main/java/ru/nbch/credit_tracker/facade/SignalFacadeV2.java @@ -1,9 +1,5 @@ package ru.nbch.credit_tracker.facade; -import java.io.File; -import java.io.IOException; -import java.util.concurrent.BlockingQueue; -import javax.xml.stream.XMLStreamException; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FileUtils; import org.springframework.stereotype.Service; @@ -21,6 +17,12 @@ import ru.nbch.credit_tracker.service.SignalService; import ru.nbch.credit_tracker.service.scoring.AuthorizationService; import ru.nbch.credit_tracker.utils.CTUtil; import ru.nbch.credit_tracker.utils.ZipUtils; + +import javax.xml.stream.XMLStreamException; +import java.io.File; +import java.io.IOException; +import java.util.concurrent.BlockingQueue; + import static ru.nbch.credit_tracker.utils.error.ExceptionUtils.clientExcp; import static ru.nbch.credit_tracker.utils.error.ExceptionUtils.serverExcp; @@ -94,7 +96,7 @@ public class SignalFacadeV2 { // throw clientExcp(SignalError.ERROR_007, XmlErrorFormat.MonitoringError); // } - Integer packageId = signalService.registerPackage(userId, packageName); + Long packageId = signalService.registerPackage(userId, packageName); log.info("Package registered. PackageId {}. Status: {}", packageId, Status.PROCESSING.name()); savingRequest.add(new PackageToSavePayload(packageId, filePath)); } catch (Exception e) { diff --git a/src/main/java/ru/nbch/credit_tracker/model/FlagsPayload.java b/src/main/java/ru/nbch/credit_tracker/model/FlagsPayload.java index a7695b5..f58c386 100644 --- a/src/main/java/ru/nbch/credit_tracker/model/FlagsPayload.java +++ b/src/main/java/ru/nbch/credit_tracker/model/FlagsPayload.java @@ -6,11 +6,11 @@ import ru.nbch.credit_tracker.service.task.TaskPayloadV2; import java.util.List; public class FlagsPayload implements TaskPayloadV2 { - private final Integer packageId; + private final Long packageId; private final List phoneFidMaps; private final boolean poison; - public FlagsPayload(Integer packageId, List fidsMapByBatch) { + public FlagsPayload(Long packageId, List fidsMapByBatch) { this.packageId = packageId; this.phoneFidMaps = fidsMapByBatch; this.poison = false; @@ -22,7 +22,7 @@ public class FlagsPayload implements TaskPayloadV2 { this.poison = poison; } - public Integer getPackageId() { + public Long getPackageId() { return packageId; } diff --git a/src/main/java/ru/nbch/credit_tracker/model/PackageToSavePayload.java b/src/main/java/ru/nbch/credit_tracker/model/PackageToSavePayload.java index d8d3d2e..f0999e8 100644 --- a/src/main/java/ru/nbch/credit_tracker/model/PackageToSavePayload.java +++ b/src/main/java/ru/nbch/credit_tracker/model/PackageToSavePayload.java @@ -3,15 +3,15 @@ package ru.nbch.credit_tracker.model; import ru.nbch.credit_tracker.service.task.TaskPayload; public class PackageToSavePayload implements TaskPayload { - private final Integer packageId; + private final Long packageId; private final String filePath; - public PackageToSavePayload(Integer packageId, String filePath) { + public PackageToSavePayload(Long packageId, String filePath) { this.packageId = packageId; this.filePath = filePath; } - public Integer getPackageId() { + public Long getPackageId() { return packageId; } diff --git a/src/main/java/ru/nbch/credit_tracker/model/PartFilePayload.java b/src/main/java/ru/nbch/credit_tracker/model/PartFilePayload.java index 04a9d62..9e7c498 100644 --- a/src/main/java/ru/nbch/credit_tracker/model/PartFilePayload.java +++ b/src/main/java/ru/nbch/credit_tracker/model/PartFilePayload.java @@ -1,14 +1,15 @@ package ru.nbch.credit_tracker.model; -import java.nio.file.Path; import ru.nbch.credit_tracker.entities.external_request.signals.Signals; +import java.nio.file.Path; + public class PartFilePayload { private final Path partPath; - private final Integer packageId; + private final Long packageId; private final Signals signals; - public PartFilePayload(Path partPath, Integer packageId, Signals signals) { + public PartFilePayload(Path partPath, Long packageId, Signals signals) { this.partPath = partPath; this.packageId = packageId; this.signals = signals; @@ -18,7 +19,7 @@ public class PartFilePayload { return partPath; } - public Integer getPackageId() { + public Long getPackageId() { return packageId; } } diff --git a/src/main/java/ru/nbch/credit_tracker/model/PhoneFidPayload.java b/src/main/java/ru/nbch/credit_tracker/model/PhoneFidPayload.java index 600033c..a2423cc 100644 --- a/src/main/java/ru/nbch/credit_tracker/model/PhoneFidPayload.java +++ b/src/main/java/ru/nbch/credit_tracker/model/PhoneFidPayload.java @@ -1,19 +1,20 @@ package ru.nbch.credit_tracker.model; -import java.util.List; import ru.nbch.credit_tracker.entities.dto.PhoneFidMap; import ru.nbch.credit_tracker.service.task.TaskPayload; +import java.util.List; + public class PhoneFidPayload implements TaskPayload { - private final Integer packageId; + private final Long packageId; private final List phoneFidsBatch; - public PhoneFidPayload(Integer packageId, List phoneFidsBatch) { + public PhoneFidPayload(Long packageId, List phoneFidsBatch) { this.packageId = packageId; this.phoneFidsBatch = phoneFidsBatch; } - public Integer getPackageId() { + public Long getPackageId() { return packageId; } diff --git a/src/main/java/ru/nbch/credit_tracker/model/PhoneFidPayloadV2.java b/src/main/java/ru/nbch/credit_tracker/model/PhoneFidPayloadV2.java index 3a79ca7..52aaeb2 100644 --- a/src/main/java/ru/nbch/credit_tracker/model/PhoneFidPayloadV2.java +++ b/src/main/java/ru/nbch/credit_tracker/model/PhoneFidPayloadV2.java @@ -1,11 +1,12 @@ package ru.nbch.credit_tracker.model; -import java.util.List; import ru.nbch.credit_tracker.entities.dto.PhoneFidMap; import ru.nbch.credit_tracker.service.task.TaskPayloadV2; +import java.util.List; + public class PhoneFidPayloadV2 implements TaskPayloadV2 { - private final Integer packageId; + private final Long packageId; private final List phoneFidsBatch; private final boolean poison; @@ -15,13 +16,13 @@ public class PhoneFidPayloadV2 implements TaskPayloadV2 { this.poison = poison; } - public PhoneFidPayloadV2(Integer packageId, List phoneFidsBatch) { + public PhoneFidPayloadV2(Long packageId, List phoneFidsBatch) { this.packageId = packageId; this.phoneFidsBatch = phoneFidsBatch; this.poison = false; } - public Integer getPackageId() { + public Long getPackageId() { return packageId; } diff --git a/src/main/java/ru/nbch/credit_tracker/model/SubjectsProfilePayload.java b/src/main/java/ru/nbch/credit_tracker/model/SubjectsProfilePayload.java index 7d58a74..421d076 100644 --- a/src/main/java/ru/nbch/credit_tracker/model/SubjectsProfilePayload.java +++ b/src/main/java/ru/nbch/credit_tracker/model/SubjectsProfilePayload.java @@ -1,19 +1,20 @@ package ru.nbch.credit_tracker.model; -import java.util.List; import ru.nbch.credit_tracker.entities.dto.SubjectProfile; import ru.nbch.credit_tracker.service.task.TaskPayload; +import java.util.List; + public class SubjectsProfilePayload implements TaskPayload { - private final Integer packageId; + private final Long packageId; private final List subjectProfiles; - public SubjectsProfilePayload(Integer packageId, List subjectProfiles) { + public SubjectsProfilePayload(Long packageId, List subjectProfiles) { this.packageId = packageId; this.subjectProfiles = subjectProfiles; } - public Integer getPackageId() { + public Long getPackageId() { return packageId; } diff --git a/src/main/java/ru/nbch/credit_tracker/model/SubjectsProfilePayloadV2.java b/src/main/java/ru/nbch/credit_tracker/model/SubjectsProfilePayloadV2.java index 73338e8..6cf8eb7 100644 --- a/src/main/java/ru/nbch/credit_tracker/model/SubjectsProfilePayloadV2.java +++ b/src/main/java/ru/nbch/credit_tracker/model/SubjectsProfilePayloadV2.java @@ -1,11 +1,12 @@ package ru.nbch.credit_tracker.model; -import java.util.List; import ru.nbch.credit_tracker.entities.dto.SubjectProfile; import ru.nbch.credit_tracker.service.task.TaskPayloadV2; +import java.util.List; + public class SubjectsProfilePayloadV2 implements TaskPayloadV2 { - private final Integer packageId; + private final Long packageId; private final List subjectProfiles; private final boolean poison; @@ -15,13 +16,13 @@ public class SubjectsProfilePayloadV2 implements TaskPayloadV2 { this.poison = poison; } - public SubjectsProfilePayloadV2(Integer packageId, List subjectProfiles) { + public SubjectsProfilePayloadV2(Long packageId, List subjectProfiles) { this.packageId = packageId; this.subjectProfiles = subjectProfiles; this.poison = false; } - public Integer getPackageId() { + public Long getPackageId() { return packageId; } diff --git a/src/main/java/ru/nbch/credit_tracker/service/task/FidIdEnricher.java b/src/main/java/ru/nbch/credit_tracker/service/task/FidIdEnricher.java index 1df5eaf..e36b679 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/task/FidIdEnricher.java +++ b/src/main/java/ru/nbch/credit_tracker/service/task/FidIdEnricher.java @@ -1,15 +1,5 @@ package ru.nbch.credit_tracker.service.task; -import java.io.IOException; -import java.io.OutputStream; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.nio.file.StandardCopyOption; -import java.nio.file.StandardOpenOption; -import java.util.List; -import java.util.UUID; -import java.util.concurrent.BlockingQueue; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import ru.nbch.credit_tracker.builder.PersonFactoryBuilderV2; @@ -23,6 +13,13 @@ import ru.nbch.credit_tracker.service.SignalService; import ru.nbch.credit_tracker.service.indic.PersonService; import ru.nbch.credit_tracker.service.xml.stax.SignalsStaxXmlWriterV2; +import java.io.IOException; +import java.io.OutputStream; +import java.nio.file.*; +import java.util.List; +import java.util.UUID; +import java.util.concurrent.BlockingQueue; + @Service @Slf4j public class FidIdEnricher implements Dispatcher{ @@ -53,7 +50,7 @@ public class FidIdEnricher implements Dispatcher{ writeSignals(personOnProcessing, taskPayload.getPackageId()); } - private void writeSignals(List persons, Integer packageId){ + private void writeSignals(List persons, Long packageId){ Path dir = Paths.get(config.getLoadDir(), "tmp_folder"); try { Files.createDirectories(dir); diff --git a/src/main/java/ru/nbch/credit_tracker/service/task/FidIdEnricherV2.java b/src/main/java/ru/nbch/credit_tracker/service/task/FidIdEnricherV2.java index 0dce400..90dcd96 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/task/FidIdEnricherV2.java +++ b/src/main/java/ru/nbch/credit_tracker/service/task/FidIdEnricherV2.java @@ -1,15 +1,5 @@ package ru.nbch.credit_tracker.service.task; -import java.io.IOException; -import java.io.OutputStream; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.nio.file.StandardCopyOption; -import java.nio.file.StandardOpenOption; -import java.util.List; -import java.util.UUID; -import java.util.concurrent.BlockingQueue; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import ru.nbch.credit_tracker.builder.PersonFactoryBuilderV2; @@ -23,6 +13,13 @@ import ru.nbch.credit_tracker.service.SignalService; import ru.nbch.credit_tracker.service.indic.PersonService; import ru.nbch.credit_tracker.service.xml.stax.SignalsStaxXmlWriterV2; +import java.io.IOException; +import java.io.OutputStream; +import java.nio.file.*; +import java.util.List; +import java.util.UUID; +import java.util.concurrent.BlockingQueue; + @Service @Slf4j public class FidIdEnricherV2 implements DispatcherV2{ @@ -54,7 +51,7 @@ public class FidIdEnricherV2 implements DispatcherV2 persons, Integer packageId){ + private void writeSignals(List persons, Long packageId){ Path dir = Paths.get(config.getLoadDir(), "tmp_folder"); try { Files.createDirectories(dir); diff --git a/src/main/java/ru/nbch/credit_tracker/service/task/PackageSaver.java b/src/main/java/ru/nbch/credit_tracker/service/task/PackageSaver.java index 57a04b9..bbda785 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/task/PackageSaver.java +++ b/src/main/java/ru/nbch/credit_tracker/service/task/PackageSaver.java @@ -1,5 +1,15 @@ package ru.nbch.credit_tracker.service.task; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import ru.nbch.credit_tracker.entities.dto.PhoneFidMap; +import ru.nbch.credit_tracker.entities.user_request.monitoring_request.MonitoringRequest; +import ru.nbch.credit_tracker.model.PackageToSavePayload; +import ru.nbch.credit_tracker.model.PhoneFidPayload; +import ru.nbch.credit_tracker.model.PhoneFidPayloadV2; +import ru.nbch.credit_tracker.service.signal.PhoneFidMapService; +import ru.nbch.credit_tracker.service.xml.stax.StaxXmlProcessor; + import java.io.BufferedInputStream; import java.io.IOException; import java.nio.file.Files; @@ -10,15 +20,6 @@ import java.util.Queue; import java.util.UUID; import java.util.concurrent.BlockingQueue; import java.util.stream.Collectors; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import ru.nbch.credit_tracker.entities.dto.PhoneFidMap; -import ru.nbch.credit_tracker.entities.user_request.monitoring_request.MonitoringRequest; -import ru.nbch.credit_tracker.model.PhoneFidPayload; -import ru.nbch.credit_tracker.model.PackageToSavePayload; -import ru.nbch.credit_tracker.model.PhoneFidPayloadV2; -import ru.nbch.credit_tracker.service.signal.PhoneFidMapService; -import ru.nbch.credit_tracker.service.xml.stax.StaxXmlProcessor; @Service @Slf4j @@ -40,7 +41,7 @@ public class PackageSaver implements Dispatcher { } @Override public void handle(PackageToSavePayload taskPayload) { - Integer packageId = taskPayload.getPackageId(); + Long packageId = taskPayload.getPackageId(); Path pkgPath = Paths.get(taskPayload.getFilePath()); log.info("Start registering subjects. PackageId: {}", taskPayload.getPackageId()); try (BufferedInputStream in = new BufferedInputStream(Files.newInputStream(pkgPath), 8 * 1024 * 1024)) { diff --git a/src/main/java/ru/nbch/credit_tracker/service/task/XmlMergeCoordinator.java b/src/main/java/ru/nbch/credit_tracker/service/task/XmlMergeCoordinator.java index 79e3519..222adfd 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/task/XmlMergeCoordinator.java +++ b/src/main/java/ru/nbch/credit_tracker/service/task/XmlMergeCoordinator.java @@ -84,7 +84,7 @@ public final class XmlMergeCoordinator implements InitializingBean { } private void mergeBatch(List inputs) throws Exception { - Integer packageId = inputs.stream().findFirst().get().getPackageId(); + Long packageId = inputs.stream().findFirst().get().getPackageId(); String outName = "merged_" + packageId + ".xml"; Path out = mergedDir.resolve(outName);