From f88af385c3bb3a1124258d17e693ef630a203c75 Mon Sep 17 00:00:00 2001 From: etreschenkov Date: Tue, 2 Dec 2025 15:10:00 +0300 Subject: [PATCH] ./ --- .../nbch/credit_tracker/facade/SignalFacadeV3.java | 10 +++++----- .../mapper/signal/UserPackageMapper.java | 1 + .../credit_tracker/service/MonitoringService.java | 5 +---- .../service/UpdatingFlagsService.java | 2 +- .../service/task/PipelinePackageOrchestrator.java | 3 +++ .../service/task/impl/KickPipeLineRestoreImpl.java | 14 ++++++++------ .../mybatis/mapper/signal/UserPackageMapper.xml | 8 ++++++++ 7 files changed, 27 insertions(+), 16 deletions(-) diff --git a/src/main/java/ru/nbch/credit_tracker/facade/SignalFacadeV3.java b/src/main/java/ru/nbch/credit_tracker/facade/SignalFacadeV3.java index 96ff9d0..c819ad1 100644 --- a/src/main/java/ru/nbch/credit_tracker/facade/SignalFacadeV3.java +++ b/src/main/java/ru/nbch/credit_tracker/facade/SignalFacadeV3.java @@ -142,11 +142,11 @@ public class SignalFacadeV3 { throw clientExcp(authResult.getError(), XmlErrorFormat.MonitoringError); } - // проверка на уникальность пакета - if (userPackageService.isPackageNotUnique(userId, packageName)) { - userPackageService.rejectPackage(userId, packageName); - throw clientExcp(SignalError.ERROR_007, XmlErrorFormat.MonitoringError); - } +// // проверка на уникальность пакета +// if (userPackageService.isPackageNotUnique(userId, packageName)) { +// userPackageService.rejectPackage(userId, packageName); +// throw clientExcp(SignalError.ERROR_007, XmlErrorFormat.MonitoringError); +// } Long packageId = userPackageService.registerPackage(userId, packageName); LogUtil.addMdcLogKey("%s %d".formatted(packageName, packageId)); diff --git a/src/main/java/ru/nbch/credit_tracker/mapper/signal/UserPackageMapper.java b/src/main/java/ru/nbch/credit_tracker/mapper/signal/UserPackageMapper.java index 9c28b22..4f4a8e3 100644 --- a/src/main/java/ru/nbch/credit_tracker/mapper/signal/UserPackageMapper.java +++ b/src/main/java/ru/nbch/credit_tracker/mapper/signal/UserPackageMapper.java @@ -39,4 +39,5 @@ public interface UserPackageMapper { @Param("packageName") String packageName); void setRejectedStatus(@Param("id") Long id, @Param("status") String status); + boolean hasOldRow(@Param("packageId") Long packageId, @Param("daysCount") Integer daysCount); } diff --git a/src/main/java/ru/nbch/credit_tracker/service/MonitoringService.java b/src/main/java/ru/nbch/credit_tracker/service/MonitoringService.java index 49774a5..adbd468 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/MonitoringService.java +++ b/src/main/java/ru/nbch/credit_tracker/service/MonitoringService.java @@ -80,10 +80,7 @@ public class MonitoringService { private void monitor() { try { log.info("Start monitoring"); - List packages = userPackageMapper.findAllPackagesByStatus( - Status.ON_MONITORING.name(), - Status.PROCESSING_REPEATED.name() - ); + List packages = userPackageMapper.findAllPackagesByStatus(Status.ON_MONITORING.name()); for (UserPackage userPackage : packages) { MDC.put("ru.nbch.credit_tracker.log.mdc.key", "[" + userPackage.getPackageName() + "]"); processPackage(userPackage); diff --git a/src/main/java/ru/nbch/credit_tracker/service/UpdatingFlagsService.java b/src/main/java/ru/nbch/credit_tracker/service/UpdatingFlagsService.java index 48998f0..a295e6c 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/UpdatingFlagsService.java +++ b/src/main/java/ru/nbch/credit_tracker/service/UpdatingFlagsService.java @@ -63,7 +63,7 @@ public class UpdatingFlagsService { for (UserPackage userPackage : packages) { MDC.put("ru.nbch.credit_tracker.log.mdc.key", "[" + userPackage.getPackageName() + "]"); log.info("Check on updating flags for Package {}", userPackage.getPackageName()); - boolean hasOldRow = phoneFidMapMapper.hasOldRow(userPackage.getId(), daysToUpdateFlags.intValue()); + boolean hasOldRow = userPackageMapper.hasOldRow(userPackage.getId(), daysToUpdateFlags.intValue()); log.info("There are {} old rows", hasOldRow ? "exist" : "doesn't exist"); if (hasOldRow) { try { diff --git a/src/main/java/ru/nbch/credit_tracker/service/task/PipelinePackageOrchestrator.java b/src/main/java/ru/nbch/credit_tracker/service/task/PipelinePackageOrchestrator.java index a71cdda..72b7208 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/task/PipelinePackageOrchestrator.java +++ b/src/main/java/ru/nbch/credit_tracker/service/task/PipelinePackageOrchestrator.java @@ -9,6 +9,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; import ru.nbch.credit_tracker.config.settings.CreditTrackerSettings; +import ru.nbch.credit_tracker.enums.RejectedStatus; import ru.nbch.credit_tracker.mapper.signal.UserPackageMapper; import ru.nbch.credit_tracker.model.impl.SignalXmlFilePayload; import ru.nbch.credit_tracker.service.MonitoringErrorProcesingService; @@ -111,6 +112,8 @@ public class PipelinePackageOrchestrator { if (success) { userPackageMapper.updatePackageOnMonitoringSuccess(packageId, LocalDateTime.now()); monitoringErrorProcesingService.findErrors(packageId); + } else { + userPackageMapper.setRejectedStatus(packageId, RejectedStatus.ERROR.getKey()); } } catch (Exception ex) { log.error("pipeline finished with error{}", ExceptionUtils.getStackTrace(ex)); diff --git a/src/main/java/ru/nbch/credit_tracker/service/task/impl/KickPipeLineRestoreImpl.java b/src/main/java/ru/nbch/credit_tracker/service/task/impl/KickPipeLineRestoreImpl.java index 0324ff6..7b56915 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/task/impl/KickPipeLineRestoreImpl.java +++ b/src/main/java/ru/nbch/credit_tracker/service/task/impl/KickPipeLineRestoreImpl.java @@ -27,15 +27,17 @@ public class KickPipeLineRestoreImpl extends KickPipeLine { @Override protected List nextPage(Integer limit) { - List pageWithNullFids = new ArrayList<>(); + List page = new ArrayList<>(); if (!nullFidsWereFound) { - pageWithNullFids = phoneFidMapMapper.findNullFidPhoneFidMap(packageId, limit, offset); + page = phoneFidMapMapper.findNullFidPhoneFidMap(packageId, limit, offset); } - if (pageWithNullFids.isEmpty()) { - nullFidsWereFound = true; - offset = 0; + if (page.isEmpty()) { + if (!nullFidsWereFound) { + nullFidsWereFound = true; + offset = 0; + } return phoneFidMapMapper.findNotNullFidPhoneFidMap(packageId, limit, offset); } - return pageWithNullFids; + return page; } } diff --git a/src/main/resources/mybatis/mapper/signal/UserPackageMapper.xml b/src/main/resources/mybatis/mapper/signal/UserPackageMapper.xml index 0613d27..55c4bcf 100644 --- a/src/main/resources/mybatis/mapper/signal/UserPackageMapper.xml +++ b/src/main/resources/mybatis/mapper/signal/UserPackageMapper.xml @@ -140,4 +140,12 @@ WHERE LEFT(membercode, 6) = #{memberCode} AND package_name = #{packageName} + + \ No newline at end of file