treshenkov/credit_tracker
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix after merging master

Browse source
This commit is contained in:
Mikhail Trofimov 2025-10-16 16:45:23 +03:00
parent 438956f8b5
commit 386ea4c18e
15 changed files with 70 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pom.xml
View file

@ -10,12 +10,12 @@
</parent>
<groupId>ru.nbch</groupId>
<artifactId>credit-tracker</artifactId>
<version>1.20</version>
<version>2.0</version>
<name>credit_tracker</name>
<description>Credit Tracker Application</description>
<properties>
<java.version>17</java.version>
<java.version>21</java.version>
<git.info.prefix>git_info</git.info.prefix>
<git.info.filename>git.properties</git.info.filename>
<registry.url>10.230.238.56:5000</registry.url>

2
src/main/java/ru/nbch/credit_tracker/builder/PersonFactoryBuilderV2.java
View file

@ -32,7 +32,7 @@ public class PersonFactoryBuilderV2 {
private SubjectProfile personData;
private Integer uid;
private Long uid;
public static PersonFactoryBuilderV2 builder() {
return new PersonFactoryBuilderV2();

2
src/main/java/ru/nbch/credit_tracker/entities/dto/SubjectProfile.java
View file

@ -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;

12
src/main/java/ru/nbch/credit_tracker/facade/SignalFacadeV2.java
View file

@ -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) {

6
src/main/java/ru/nbch/credit_tracker/model/FlagsPayload.java
View file

@ -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<PhoneFidMap> phoneFidMaps;
private final boolean poison;
public FlagsPayload(Integer packageId, List<PhoneFidMap> fidsMapByBatch) {
public FlagsPayload(Long packageId, List<PhoneFidMap> 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;
}

6
src/main/java/ru/nbch/credit_tracker/model/PackageToSavePayload.java
View file

@ -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;
}

9
src/main/java/ru/nbch/credit_tracker/model/PartFilePayload.java
View file

@ -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;
}
}

9
src/main/java/ru/nbch/credit_tracker/model/PhoneFidPayload.java
View file

@ -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<PhoneFidMap> phoneFidsBatch;
public PhoneFidPayload(Integer packageId, List<PhoneFidMap> phoneFidsBatch) {
public PhoneFidPayload(Long packageId, List<PhoneFidMap> phoneFidsBatch) {
this.packageId = packageId;
this.phoneFidsBatch = phoneFidsBatch;
}
public Integer getPackageId() {
public Long getPackageId() {
return packageId;
}

9
src/main/java/ru/nbch/credit_tracker/model/PhoneFidPayloadV2.java
View file

@ -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<PhoneFidMap> phoneFidsBatch;
private final boolean poison;
@ -15,13 +16,13 @@ public class PhoneFidPayloadV2 implements TaskPayloadV2 {
this.poison = poison;
}
public PhoneFidPayloadV2(Integer packageId, List<PhoneFidMap> phoneFidsBatch) {
public PhoneFidPayloadV2(Long packageId, List<PhoneFidMap> phoneFidsBatch) {
this.packageId = packageId;
this.phoneFidsBatch = phoneFidsBatch;
this.poison = false;
}
public Integer getPackageId() {
public Long getPackageId() {
return packageId;
}

9
src/main/java/ru/nbch/credit_tracker/model/SubjectsProfilePayload.java
View file

@ -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<SubjectProfile> subjectProfiles;
public SubjectsProfilePayload(Integer packageId, List<SubjectProfile> subjectProfiles) {
public SubjectsProfilePayload(Long packageId, List<SubjectProfile> subjectProfiles) {
this.packageId = packageId;
this.subjectProfiles = subjectProfiles;
}
public Integer getPackageId() {
public Long getPackageId() {
return packageId;
}

9
src/main/java/ru/nbch/credit_tracker/model/SubjectsProfilePayloadV2.java
View file

@ -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<SubjectProfile> subjectProfiles;
private final boolean poison;
@ -15,13 +16,13 @@ public class SubjectsProfilePayloadV2 implements TaskPayloadV2 {
this.poison = poison;
}
public SubjectsProfilePayloadV2(Integer packageId, List<SubjectProfile> subjectProfiles) {
public SubjectsProfilePayloadV2(Long packageId, List<SubjectProfile> subjectProfiles) {
this.packageId = packageId;
this.subjectProfiles = subjectProfiles;
this.poison = false;
}
public Integer getPackageId() {
public Long getPackageId() {
return packageId;
}

19
src/main/java/ru/nbch/credit_tracker/service/task/FidIdEnricher.java
View file

@ -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<SubjectsProfilePayload>{
@ -53,7 +50,7 @@ public class FidIdEnricher implements Dispatcher<SubjectsProfilePayload>{
writeSignals(personOnProcessing, taskPayload.getPackageId());
}
private void writeSignals(List<Person> persons, Integer packageId){
private void writeSignals(List<Person> persons, Long packageId){
Path dir = Paths.get(config.getLoadDir(), "tmp_folder");
try {
Files.createDirectories(dir);

19
src/main/java/ru/nbch/credit_tracker/service/task/FidIdEnricherV2.java
View file

@ -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<SubjectsProfilePayloadV2, SendSignalsPayload>{
@ -54,7 +51,7 @@ public class FidIdEnricherV2 implements DispatcherV2<SubjectsProfilePayloadV2, S
return new SendSignalsPayload(false);
}
private void writeSignals(List<Person> persons, Integer packageId){
private void writeSignals(List<Person> persons, Long packageId){
Path dir = Paths.get(config.getLoadDir(), "tmp_folder");
try {
Files.createDirectories(dir);

21
src/main/java/ru/nbch/credit_tracker/service/task/PackageSaver.java
View file

@ -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<PackageToSavePayload> {
}
@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)) {

2
src/main/java/ru/nbch/credit_tracker/service/task/XmlMergeCoordinator.java
View file

@ -84,7 +84,7 @@ public final class XmlMergeCoordinator implements InitializingBean {
}
private void mergeBatch(List<PartFilePayload> 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);