From e18e1f3724a9d23b9d74f5c3f8b7c901393f16ce Mon Sep 17 00:00:00 2001
From: etreschenkov <ETreschenkov@mfd.ru>
Date: Tue, 18 Nov 2025 18:34:27 +0300
Subject: [PATCH] ./

---
 .../config/datasource/IndicDataSourceConfig.java    |  1 +
 .../service/task/impl/FidIdEnricher.java            |  5 -----
 .../service/task/impl/FlagsEnricherV2.java          | 13 +++----------
 .../service/task/impl/SaveSubjectHandler.java       | 11 ++++++-----
 4 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/src/main/java/ru/nbch/credit_tracker/config/datasource/IndicDataSourceConfig.java b/src/main/java/ru/nbch/credit_tracker/config/datasource/IndicDataSourceConfig.java
index 400ca07..557adc2 100644
--- a/src/main/java/ru/nbch/credit_tracker/config/datasource/IndicDataSourceConfig.java
+++ b/src/main/java/ru/nbch/credit_tracker/config/datasource/IndicDataSourceConfig.java
@@ -42,6 +42,7 @@ public class IndicDataSourceConfig extends DatabaseConfig {
         dataSource.setMaxLifetime(indicSetings.maxLifetime());
         dataSource.setKeepaliveTime(indicSetings.keepaliveTime());
         dataSource.setLeakDetectionThreshold(indicSetings.leakDetectionThreshold());
+        dataSource.setAutoCommit(false);
 
         try (Connection connection = dataSource.getConnection()) {
             connection.isValid(3);
diff --git a/src/main/java/ru/nbch/credit_tracker/service/task/impl/FidIdEnricher.java b/src/main/java/ru/nbch/credit_tracker/service/task/impl/FidIdEnricher.java
index b55949b..251fed5 100644
--- a/src/main/java/ru/nbch/credit_tracker/service/task/impl/FidIdEnricher.java
+++ b/src/main/java/ru/nbch/credit_tracker/service/task/impl/FidIdEnricher.java
@@ -73,10 +73,5 @@ public class FidIdEnricher implements Handler<SubjectPayload, PartFilePayload> {
             throw new RuntimeException(e);
         }
         return done;
-//        try {
-//            mergerQueue.put(new PartFilePayload(done, packageId, null));
-//        } catch (InterruptedException e) {
-//            throw new RuntimeException(e);
-//        }
     }
 }
diff --git a/src/main/java/ru/nbch/credit_tracker/service/task/impl/FlagsEnricherV2.java b/src/main/java/ru/nbch/credit_tracker/service/task/impl/FlagsEnricherV2.java
index 521ad15..57318e1 100644
--- a/src/main/java/ru/nbch/credit_tracker/service/task/impl/FlagsEnricherV2.java
+++ b/src/main/java/ru/nbch/credit_tracker/service/task/impl/FlagsEnricherV2.java
@@ -1,9 +1,5 @@
 package ru.nbch.credit_tracker.service.task.impl;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
@@ -28,16 +24,12 @@ public class FlagsEnricherV2 implements Consumer<SubjectPayload> {
 
     private final FlagsService2 flagsService;
     private final ExecutorService ioPool;
-    private final ObjectMapper mapper = new ObjectMapper()
-        .registerModule(new JavaTimeModule())
-        .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
-        .setSerializationInclusion(JsonInclude.Include.NON_NULL);
 
     public FlagsEnricherV2(FlagsService2 flagsService,
                            PhoneFidMapMapper phoneFidMapMapper) {
         this.flagsService = flagsService;
-        this.ioPool = new ThreadPoolExecutor(10,
-            10,
+        this.ioPool = new ThreadPoolExecutor(5,
+            5,
             0L, TimeUnit.MINUTES,
             new LinkedBlockingQueue<>(100),
             r -> {
@@ -100,4 +92,5 @@ public class FlagsEnricherV2 implements Consumer<SubjectPayload> {
         log.info("submitting payload. active tasks number: {}; queue size: {}", casted.getActiveCount(), casted.getQueue().size());
         this.ioPool.submit(() -> process(subjectPayload));
     }
+
 }
diff --git a/src/main/java/ru/nbch/credit_tracker/service/task/impl/SaveSubjectHandler.java b/src/main/java/ru/nbch/credit_tracker/service/task/impl/SaveSubjectHandler.java
index b8bae2d..47dd3e8 100644
--- a/src/main/java/ru/nbch/credit_tracker/service/task/impl/SaveSubjectHandler.java
+++ b/src/main/java/ru/nbch/credit_tracker/service/task/impl/SaveSubjectHandler.java
@@ -7,7 +7,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import ru.nbch.credit_tracker.entities.app.PhoneFidMap;
 import ru.nbch.credit_tracker.entities.indic.Name;
-import ru.nbch.credit_tracker.mapper.signal.PhoneFidMapMapper;
 import ru.nbch.credit_tracker.model.NameData;
 import ru.nbch.credit_tracker.model.SubjectProfile;
 import ru.nbch.credit_tracker.model.impl.SubjectPayload;
@@ -24,12 +23,9 @@ import ru.nbch.credit_tracker.utils.CTUtil;
 //todo опять нейминг класса, варианты: ResolveSubject; DefineIcrsSubject; IcrsMapping/Resolving; PackageSaver; Filler...
 public class SaveSubjectHandler implements Handler<SubjectPayload, SubjectPayload> {
     private final PhoneService2 phoneService2;
-    private final PhoneFidMapMapper phoneFidMapMapper;
 
-    public SaveSubjectHandler(PhoneService2 phoneService2,
-                              PhoneFidMapMapper phoneFidMapMapper) {
+    public SaveSubjectHandler(PhoneService2 phoneService2) {
         this.phoneService2 = phoneService2;
-        this.phoneFidMapMapper = phoneFidMapMapper;
     }
 
     @Override
@@ -70,4 +66,9 @@ public class SaveSubjectHandler implements Handler<SubjectPayload, SubjectPayloa
         }
         return new SubjectPayload(taskPayload.getPackageId(), subjects);
     }
+
+    @Override
+    public int preferredConcurrency() {
+        return 15;
+    }
 }