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

http://jira.mfd.msk:8088/browse/BKI-3217

Browse source
This commit is contained in:
etreschenkov 2026-01-19 17:54:48 +03:00
parent e7cb1526d7
commit 543e492bf2
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/ru/nbch/credit_tracker/service/UserPackageService.java
View file

@ -21,7 +21,7 @@ public class UserPackageService {
} }
public boolean isPackageNotUnique(String userId, String packageName) { public boolean isPackageNotUnique(String userId, String packageName) {
return userPackageMapper.isPackageNotUnique(userId, packageName); return userPackageMapper.isPackageNotUnique(userId.substring(0, 6), packageName);
} }
public Long registerPackage(String userId, String packageName, List<Integer> signalTypes) { public Long registerPackage(String userId, String packageName, List<Integer> signalTypes) {
@ -63,7 +63,7 @@ public class UserPackageService {
userPackageMapper.setFidChanged(id); userPackageMapper.setFidChanged(id);
} }
public List<UserPackage> findAllPackages(String userId) { public List<UserPackage> findAllPackages(String userId) {
return userPackageMapper.findAllPackagesByUserId(userId); return userPackageMapper.findAllPackagesByUserId(userId.substring(0, 6));
} }
public List<UserPackage> findByMemberCodeAndPackageName(String memberCode, String packageName) { public List<UserPackage> findByMemberCodeAndPackageName(String memberCode, String packageName) {

11
src/main/java/ru/nbch/credit_tracker/service/indic/PersonServiceV2.java
View file

@ -41,22 +41,20 @@ public class PersonServiceV2 {
} }
List<Id> passports = mapper.findPassportData(fids); List<Id> passports = mapper.findPassportData(fids);
Map<Integer, Id> idByFid = passports.stream() return passports.stream()
.filter(this::isDUL) .filter(this::isDUL)
.filter(this::checkLength)
.collect(Collectors.groupingBy( .collect(Collectors.groupingBy(
Id::getFid, Id::getFid,
Collectors.collectingAndThen( Collectors.collectingAndThen(
Collectors.toList(), Collectors.toList(),
docs -> docs.stream() docs -> docs.stream()
.filter(p -> .filter(p -> "21".equals(p.getIdType2()) || "21".equals(p.getIdType()))
("21".equals(p.getIdType2()) || "21".equals(p.getIdType()))
&& CTUtil.normalizePassport(p).length() == 10)
.max(byDatesDesc) .max(byDatesDesc)
.or(() -> docs.stream().max(byDatesDesc)) .or(() -> docs.stream().max(byDatesDesc))
.orElse(null) .orElse(null)
) )
)); ));
return idByFid;
} }
/** /**
@ -103,4 +101,7 @@ public class PersonServiceV2 {
(idType2 != null && (idType2 >= 1 && idType2 <= 999)); (idType2 != null && (idType2 >= 1 && idType2 <= 999));
} }
private boolean checkLength(Id p) {
return ("21".equals(p.getIdType2()) || "21".equals(p.getIdType())) && CTUtil.normalizePassport(p).length() == 10;
}
} }