From 9729697f3a982ec955a01350ee627b5bc0d087b0 Mon Sep 17 00:00:00 2001 From: ialbert Date: Mon, 16 Mar 2026 17:33:53 +0300 Subject: [PATCH] http://jira.mfd.msk:8088/browse/BKI-3489 --- .../entities/app/PackagesRecordsMap.java | 2 +- .../service/indic/PhoneService2.java | 6 +++--- .../service/mode/monitoring/MonitoringService.java | 5 +++-- .../service/task/impl/KickPipeLine.java | 2 +- .../credit_tracker/service/task/impl/Saver.java | 2 +- .../java/ru/nbch/credit_tracker/utils/CTUtil.java | 4 ++++ .../mybatis/mapper/signal/PackageRecordsMapper.xml | 14 +++++++------- 7 files changed, 20 insertions(+), 15 deletions(-) diff --git a/src/main/java/ru/nbch/credit_tracker/entities/app/PackagesRecordsMap.java b/src/main/java/ru/nbch/credit_tracker/entities/app/PackagesRecordsMap.java index 1d91ea0..85821bb 100644 --- a/src/main/java/ru/nbch/credit_tracker/entities/app/PackagesRecordsMap.java +++ b/src/main/java/ru/nbch/credit_tracker/entities/app/PackagesRecordsMap.java @@ -15,6 +15,6 @@ public class PackagesRecordsMap { private Long id; private Long packageId; private String subjectId; - private String phone; + private Long phone_l; private String errorText; } diff --git a/src/main/java/ru/nbch/credit_tracker/service/indic/PhoneService2.java b/src/main/java/ru/nbch/credit_tracker/service/indic/PhoneService2.java index f3cebb9..3cce926 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/indic/PhoneService2.java +++ b/src/main/java/ru/nbch/credit_tracker/service/indic/PhoneService2.java @@ -1,10 +1,10 @@ package ru.nbch.credit_tracker.service.indic; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import java.util.Comparator; import java.util.HashMap; import java.util.List; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import ru.nbch.credit_tracker.entities.app.PackagesRecordsMap; @@ -46,7 +46,7 @@ public class PhoneService2 { .map(phoneFidMap -> new HashMap() {{ put("subject_id", phoneFidMap.getSubjectId()); // put("fid", phoneFidMap.getFid()); - put("phone", phoneFidMap.getPhone()); + put("phone_l", phoneFidMap.getPhone_l()); put("package_id", phoneFidMap.getPackageId()); // put("calculated_at", phoneFidMap.getCalculatedAt()); }}).toList()); diff --git a/src/main/java/ru/nbch/credit_tracker/service/mode/monitoring/MonitoringService.java b/src/main/java/ru/nbch/credit_tracker/service/mode/monitoring/MonitoringService.java index e573006..1d19260 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/mode/monitoring/MonitoringService.java +++ b/src/main/java/ru/nbch/credit_tracker/service/mode/monitoring/MonitoringService.java @@ -261,13 +261,14 @@ public class MonitoringService { cacheByPhone = subjectRepInfo.cacheByPhone; } else { packagesRecord = packageRecordsService.findPackageRecordsById(person.getUid()); - cacheByPhone = packageRecordsService.findCachedByPhone(Long.valueOf(packagesRecord.getPhone())); + cacheByPhone = packageRecordsService.findCachedByPhone(packagesRecord.getPhone_l()); subjectRepInfoMap.put(person.getUid(), new SubjectRepInfo(packagesRecord, cacheByPhone)); } if (cacheByPhone != null) { Subject subject = new Subject(); subject.setId(packagesRecord.getSubjectId()); // Уникальный идентификатор субъекта (равен Id из XML-пакета при установке мониторинга) - subject.setClientId(packagesRecord.getPhone()); + //fixme нужны ли 0 в xml? также мб выпилить запись в phone: ru.nbch.credit_tracker.mapper.signal.PackagesRecordsMapper.registerJson + subject.setClientId(CTUtil.normalizePhoneNumberZeroesOnly(packagesRecord.getPhone_l())); subject.setFlagDebt5000(cacheByPhone.getFlagDebt5000()); subject.setFlag9012(cacheByPhone.getFlag90days()); subject.setSignals(signals); diff --git a/src/main/java/ru/nbch/credit_tracker/service/task/impl/KickPipeLine.java b/src/main/java/ru/nbch/credit_tracker/service/task/impl/KickPipeLine.java index 747a5a2..fd13a1f 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/task/impl/KickPipeLine.java +++ b/src/main/java/ru/nbch/credit_tracker/service/task/impl/KickPipeLine.java @@ -70,7 +70,7 @@ public abstract class KickPipeLine implements IPipeLineStarter { List subjectProfiles = page.stream().map(phoneFidMap -> SubjectProfile.builder() .mapId(phoneFidMap.getId()) .identifier(phoneFidMap.getSubjectId()) - .phone(Long.valueOf(phoneFidMap.getPhone())) + .phone(phoneFidMap.getPhone_l()) .build()).toList(); try { SubjectPayload payload = new SubjectPayload(packageId, userPackage.getUserId(), userPackage.getPackageName(), subjectProfiles); diff --git a/src/main/java/ru/nbch/credit_tracker/service/task/impl/Saver.java b/src/main/java/ru/nbch/credit_tracker/service/task/impl/Saver.java index cd56ee7..f191f20 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/task/impl/Saver.java +++ b/src/main/java/ru/nbch/credit_tracker/service/task/impl/Saver.java @@ -46,7 +46,7 @@ public class Saver { List subjectForSave = request.getSubjects().getSubject().stream().map(subject -> PackagesRecordsMap.builder() .subjectId(subject.getId()) .packageId(packageId) - .phone(subject.getClientId()) + .phone_l(Long.valueOf(subject.getClientId())) // validated ru.nbch.credit_tracker.service.ValidationService.validateMonitoringRequest .build()).toList(); phoneService2.registerSubjects(subjectForSave); request.getSubjects().getSubject().clear(); diff --git a/src/main/java/ru/nbch/credit_tracker/utils/CTUtil.java b/src/main/java/ru/nbch/credit_tracker/utils/CTUtil.java index 81320dc..74c871c 100644 --- a/src/main/java/ru/nbch/credit_tracker/utils/CTUtil.java +++ b/src/main/java/ru/nbch/credit_tracker/utils/CTUtil.java @@ -106,6 +106,10 @@ public class CTUtil { return "9" + String.format("%09d", phoneNumber); } + public static String normalizePhoneNumberZeroesOnly(Long phoneNumber) { + return String.format("%09d", phoneNumber); + } + public static String defineIdType(String idType, String idType2) { if (StringUtils.isNotBlank(idType2)) { return idType2; diff --git a/src/main/resources/mybatis/mapper/signal/PackageRecordsMapper.xml b/src/main/resources/mybatis/mapper/signal/PackageRecordsMapper.xml index e9328b0..68a2692 100644 --- a/src/main/resources/mybatis/mapper/signal/PackageRecordsMapper.xml +++ b/src/main/resources/mybatis/mapper/signal/PackageRecordsMapper.xml @@ -9,7 +9,7 @@ - + @@ -17,7 +17,7 @@ SELECT id, package_id, subject_id, - phone, + phone_l, error_text FROM signals_phone_fid_map WHERE id = #{id} @@ -37,19 +37,19 @@