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

http://jira.mfd.msk:8088/browse/BKI-3201 Fix updating flag condition; Update version to 1.9

Browse source
This commit is contained in:
Mikhail Trofimov 2025-09-11 10:29:39 +03:00
parent 1aff345768
commit f24a6a978a
7 changed files with 11 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docker_compose/credit_tracker_config.env
View file

@ -1,5 +1,5 @@
#commons
APP_VERSION=1.8
APP_VERSION=1.9
REGISTRY_URL=rh8-vm3.nbki.msk:5000
JMX_PORT=
JMX_HOSTNAME=

2
pom.xml
View file

@ -10,7 +10,7 @@
</parent>
<groupId>ru.nbch</groupId>
<artifactId>credit-tracker</artifactId>
<version>1.8</version>
<version>1.9</version>
<name>credit_tracker</name>
<description>Credit Tracker Application</description>

2
src/main/java/ru/nbch/credit_tracker/facade/SignalFacade.java
View file

@ -222,7 +222,7 @@ public class SignalFacade {
signalService.updatePackageStatus(packageId, Status.ON_MONITORING);
return;
}
if (signalRestService.setupMonitoring(packageId, null)) {
if (signalRestService.setupMonitoring(packageId)) {
log.info("Package was successfully registered in signal service. PackageId: {} PackageName: {}", packageId, packageName);
signalService.updatePackageStatus(packageId, Status.ON_MONITORING);
} else {

13
src/main/java/ru/nbch/credit_tracker/service/SignalService.java
View file

@ -204,7 +204,7 @@ public class SignalService {
* Формирует файл запроса в официальный сервис сигналов, выгружая паспортные данные пачками и сразу записывая их в файл
* @return Путь к файлу запроса к официальному сервису сигналов на постановку на мониторинг
*/
public String writeSignals(Integer packageId, Predicate<PhoneFidMap> filter) {
public String writeSignals(Integer packageId) {
String folderPath = config.getLoadDir() + File.separator + "tmp_folder" + File.separator + packageId + File.separator;
String filePath = folderPath + UUID.randomUUID() + "_output.xml";
@ -216,7 +216,7 @@ public class SignalService {
signalsStaxXmlWriter.writeWithStax(filePath,
signals,
writer -> buildPersons(packageId, filter, writer));
writer -> buildPersons(packageId, writer));
return filePath;
}
@ -237,17 +237,12 @@ public class SignalService {
* Обрабатывает все PhoneFidMap по packageId, выгружая их пачками и фильтруя по переданному фильтру.
* writer записывает пачку сразу в файл
*/
private void buildPersons(Integer packageId, Predicate<PhoneFidMap> filter, Consumer<List<Person>> writer) {
private void buildPersons(Integer packageId, Consumer<List<Person>> writer) {
int offset = 0;
List<PhoneFidMap> batch;
do {
batch = phoneFidMapService.findFullPhoneFidMap(packageId, offset, batchSize);
List<Person> persons;
if (filter != null) {
persons = findPersons(batch.stream().filter(filter).toList());
} else {
persons = findPersons(batch);
}
List<Person> persons = findPersons(batch);
if (!persons.isEmpty()) {
writer.accept(persons); // записывает пачку Persons в файл
}

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

@ -42,7 +42,7 @@ public class UpdateProcessingPackagesService {
signalService.updatePackageStatus(packageId, Status.ON_MONITORING);
return;
}
if (signalRestService.setupMonitoring(packageId, null)) {
if (signalRestService.setupMonitoring(packageId)) {
log.info("Package was successfully registered in signal service. PackageId: {} PackageName: {}", packageId, packageName);
signalService.updatePackageStatus(packageId, Status.ON_MONITORING);
} else {

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

@ -60,7 +60,7 @@ public class UpdatingFlagsService {
Predicate<PhoneFidMap> filter = subject -> subject.getCalculatedAt() != null && hasDaysPassed(subject.getCalculatedAt());
SignalService.UpdateResult updateResult = signalService.updateSubjects(packageId, filter);
if (updateResult.isUpdated()) {
if (signalRestService.setupMonitoring(packageId, filter)) {
if (signalRestService.setupMonitoring(packageId)) {
log.info("Flags were updated successfully. PackageId: {} PackageName: {}. Package status changed to ON_MONITORING", packageId, packageName);
signalService.updatePackageStatus(packageId, Status.ON_MONITORING);
} else {

6
src/main/java/ru/nbch/credit_tracker/service/signal/SignalRestService.java
View file

@ -11,7 +11,6 @@ import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
import org.springframework.web.client.RestTemplate;
import ru.nbch.credit_tracker.config.settings.CreditTrackerSettings;
import ru.nbch.credit_tracker.entities.dto.PhoneFidMap;
import ru.nbch.credit_tracker.entities.external_response.errors.SgnlReport;
import ru.nbch.credit_tracker.entities.external_response.online_report.SgnlOnlineReport;
import ru.nbch.credit_tracker.service.SignalService;
@ -25,7 +24,6 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.security.MessageDigest;
import java.util.Base64;
import java.util.function.Predicate;
import java.util.zip.GZIPInputStream;
import java.util.zip.GZIPOutputStream;
@ -63,8 +61,8 @@ public class SignalRestService {
* Ставит пакет на мониторинг в официальный сервис сигналов
* @return true - если пакет успешно поставился на мониторинг. false - в противном случае
*/
public boolean setupMonitoring(Integer packageId, Predicate<PhoneFidMap> filter) throws Exception {
String path = signalService.writeSignals(packageId, filter);
public boolean setupMonitoring(Integer packageId) throws Exception {
String path = signalService.writeSignals(packageId);
Resource request = compressFile(path);
MultiValueMap<String, Resource> body = new LinkedMultiValueMap<>();