notification sending on duplicate transaction number added in xml-importer http://jira.mfd.msk:8088/browse/CLS-725

clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/config/ImporterImdgConfig.java

@@ -34,7 +34,7 @@ public class ImporterImdgConfig {
 
     @Autowired
     @Bean
-    public ImdgProvider imdgProvider(
+    public HazelcastService imdgProvider(
         @Qualifier("taskExecutorHazelcastClientInitializer") ThreadPoolTaskExecutor taskExecutorHazelcastClientInitializer,
         @Qualifier("taskExecutorIdGeneratorAwaiter") ThreadPoolTaskExecutor taskExecutorIdGeneratorAwaiter,
         ImportXMLServiceSettings settings

clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/objects/DF01ObjectTag.java

@@ -7,12 +7,19 @@ import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.util.Objects;
 import ru.clearing.classes.statics.data.sdf.SDf01;
+import ru.spcex.clearing.imdg.IMDGDistributedNames;
 import ru.spcex.clearing.xml.importer.logic.data.enums.ETable;
 
 public class DF01ObjectTag extends ObjectTag<SDf01> {
     private static final ETable PREFIX = ETable.DF_01;
+    private static final Class<SDf01> CLAZZ = SDf01.class;
+    private static final String NAME_OF_HZ_MAP = IMDGDistributedNames.Map_SDf01;
     private final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd.MM.yy");
 
+    public DF01ObjectTag() {
+        super(PREFIX, CLAZZ, NAME_OF_HZ_MAP);
+    }
+
     @JacksonXmlProperty(isAttribute = true, localName = "CURR_CODE")
     private String currCode;
 
@@ -50,10 +57,6 @@ public class DF01ObjectTag extends ObjectTag<SDf01> {
     @JacksonXmlProperty(isAttribute = true, localName = "FILE_TYPE")
     private String fileType;
 
-    public DF01ObjectTag() {
-        super(PREFIX);
-    }
-
     @Override
     public SDf01 getSDfEntity() {
         SDf01 result = new SDf01();

clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/objects/DF04ObjectTag.java

@@ -7,12 +7,19 @@ import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.util.Objects;
 import ru.clearing.classes.statics.data.sdf.SDf04;
+import ru.spcex.clearing.imdg.IMDGDistributedNames;
 import ru.spcex.clearing.xml.importer.logic.data.enums.ETable;
 
 public class DF04ObjectTag extends ObjectTag<SDf04> {
     private static final ETable PREFIX = ETable.DF_04;
+    private static final Class<SDf04> CLAZZ = SDf04.class;
+    private static final String NAME_OF_HZ_MAP = IMDGDistributedNames.Map_SDf04;
     private final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd.MM.yy");
 
+    public DF04ObjectTag() {
+        super(PREFIX, CLAZZ, NAME_OF_HZ_MAP);
+    }
+
     @JacksonXmlProperty(isAttribute = true, localName = "SEG_TYPE")
     private String segType;
 
@@ -61,10 +68,6 @@ public class DF04ObjectTag extends ObjectTag<SDf04> {
     @JacksonXmlProperty(isAttribute = true, localName = "IMP_RESULT")
     private String impResult;
 
-    public DF04ObjectTag() {
-        super(PREFIX);
-    }
-
     @Override
     public SDf04 getSDfEntity() {
         SDf04 result = new SDf04();

clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/objects/DF06ObjectTag.java

@@ -8,12 +8,19 @@ import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.util.Objects;
 import ru.clearing.classes.statics.data.sdf.SDf06;
+import ru.spcex.clearing.imdg.IMDGDistributedNames;
 import ru.spcex.clearing.xml.importer.logic.data.enums.ETable;
 
 public class DF06ObjectTag extends ObjectTag<SDf06> {
     private static final ETable PREFIX = ETable.DF_06;
+    private static final Class<SDf06> CLAZZ = SDf06.class;
+    private static final String NAME_OF_HZ_MAP = IMDGDistributedNames.Map_SDf06;
     private final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd.MM.yy");
 
+    public DF06ObjectTag() {
+        super(PREFIX, CLAZZ, NAME_OF_HZ_MAP);
+    }
+
     @JacksonXmlProperty(isAttribute = true, localName = "ACCOUNT")
     private String account;
 
@@ -54,10 +61,6 @@ public class DF06ObjectTag extends ObjectTag<SDf06> {
     @JacksonXmlProperty(isAttribute = true, localName = "PAY_VAL")
     private String payVal;
 
-    public DF06ObjectTag() {
-        super(PREFIX);
-    }
-
     @Override
     public SDf06 getSDfEntity() {
         SDf06 result = new SDf06();

clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/objects/DF52ObjectTag.java

@@ -7,12 +7,19 @@ import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.util.Objects;
 import ru.clearing.classes.statics.data.sdf.SDf52;
+import ru.spcex.clearing.imdg.IMDGDistributedNames;
 import ru.spcex.clearing.xml.importer.logic.data.enums.ETable;
 
 public class DF52ObjectTag extends ObjectTag<SDf52> {
     private static final ETable PREFIX = ETable.DF_52;
+    private static final Class<SDf52> CLAZZ = SDf52.class;
+    private static final String NAME_OF_HZ_MAP = IMDGDistributedNames.Map_SDf52;
     private final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd.MM.yy");
 
+    public DF52ObjectTag() {
+        super(PREFIX, CLAZZ, NAME_OF_HZ_MAP);
+    }
+
     @JacksonXmlProperty(isAttribute = true, localName = "ACCOUNT")
     private String account;
 
@@ -32,10 +39,6 @@ public class DF52ObjectTag extends ObjectTag<SDf52> {
     @JacksonXmlProperty(isAttribute = true, localName = "ACC_TYPE")
     private String accType;
 
-    public DF52ObjectTag() {
-        super(PREFIX);
-    }
-
     @Override
     public SDf52 getSDfEntity() {
         SDf52 result = new SDf52();

clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/objects/DF55ObjectTag.java

@@ -7,12 +7,19 @@ import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.util.Objects;
 import ru.clearing.classes.statics.data.sdf.SDf55;
+import ru.spcex.clearing.imdg.IMDGDistributedNames;
 import ru.spcex.clearing.xml.importer.logic.data.enums.ETable;
 
 public class DF55ObjectTag extends ObjectTag<SDf55> {
     private static final ETable PREFIX = ETable.DF_55;
+    private static final Class<SDf55> CLAZZ = SDf55.class;
+    private static final String NAME_OF_HZ_MAP = IMDGDistributedNames.Map_SDf55;
     private final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd.MM.yy");
 
+    public DF55ObjectTag() {
+        super(PREFIX, CLAZZ, NAME_OF_HZ_MAP);
+    }
+
     @JacksonXmlProperty(isAttribute = true, localName = "SEG_TYPE")
     private String segType;
 
@@ -123,10 +130,6 @@ public class DF55ObjectTag extends ObjectTag<SDf55> {
     @JacksonXmlProperty(isAttribute = true, localName = "SWIFT_INT")
     private String swiftInt;
 
-    public DF55ObjectTag() {
-        super(PREFIX);
-    }
-
     @Override
     public SDf55 getSDfEntity() {
         SDf55 result = new SDf55();

clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/objects/DF57ObjectTag.java

@@ -5,14 +5,26 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import java.time.Instant;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
+import java.util.Collection;
+import java.util.Map;
 import java.util.Objects;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import ru.clearing.classes.statics.data.sdf.SDf57;
+import ru.spcex.clearing.imdg.IMDGDistributedNames;
 import ru.spcex.clearing.xml.importer.logic.data.enums.ETable;
 
 public class DF57ObjectTag extends ObjectTag<SDf57> {
+    private final Logger log = LoggerFactory.getLogger(getClass());
     private static final ETable PREFIX = ETable.DF_57;
+    private static final Class<SDf57> CLAZZ = SDf57.class;
+    private static final String NAME_OF_HZ_MAP = IMDGDistributedNames.Map_SDf57;
     private final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd.MM.yy");
 
+    public DF57ObjectTag() {
+        super(PREFIX, CLAZZ, NAME_OF_HZ_MAP);
+    }
+
     @JacksonXmlProperty(isAttribute = true, localName = "ID")
     private Long id;
 
@@ -116,10 +128,6 @@ public class DF57ObjectTag extends ObjectTag<SDf57> {
     @JacksonXmlProperty(isAttribute = true, localName = "KT_OUT")
     private String ktOut;
 
-    public DF57ObjectTag() {
-        super(PREFIX);
-    }
-
     @Override
     public SDf57 getSDfEntity() {
         SDf57 result = new SDf57();
@@ -174,6 +182,18 @@ public class DF57ObjectTag extends ObjectTag<SDf57> {
         return result;
     }
 
+    @Override
+    public boolean checkOnExisting(SDf57 obj) {
+        if (map == null) {
+            bootMap();
+        }
+        Collection<SDf57> sDf57s = map.getCollectionObjectsByFieldValues(Map.of("dbfId", obj.getDbfId()));
+        if (!sDf57s.isEmpty()) {
+            log.warn("Skip insert by {}, sdf57.dbfId: {}", PREFIX, obj.getDbfId());
+        }
+        return sDf57s.isEmpty();
+    }
+
     public Long getId() {
         return id;
     }

clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/objects/ObjectTag.java

@@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import ru.spcex.clearing.xml.importer.logic.data.enums.ETable;
 import ru.spcex.platform.classes.base.SpcexObjectBase;
 import ru.spcex.platform.imdg.iml.hazelcast.adapter.ImdgHazelcast;
+import ru.spcex.platform.imdg.iml.hazelcast.service.HazelcastService;
 
 @JsonTypeInfo(use = JsonTypeInfo.Id.DEDUCTION)
 @JsonSubTypes({
@@ -16,19 +17,25 @@ import ru.spcex.platform.imdg.iml.hazelcast.adapter.ImdgHazelcast;
     @JsonSubTypes.Type(DF55ObjectTag.class),
     @JsonSubTypes.Type(DF57ObjectTag.class)
 })
-public abstract class ObjectTag<T1 extends SpcexObjectBase> {
+public abstract class ObjectTag<T extends SpcexObjectBase> {
     private final ETable prefix;
+    private final Class<T> clazz;
+    private final String nameOfMap;
+    protected HazelcastService hazelcastService;
+    protected ImdgHazelcast<T> map;
 
     @JsonIgnore
     protected String fileName;
     @JsonIgnore
     protected Long generationId;
 
-    public ObjectTag(ETable prefix) {
+    public ObjectTag(ETable prefix, Class<T> clazz, String nameOfMap) {
         this.prefix = prefix;
+        this.clazz = clazz;
+        this.nameOfMap = nameOfMap;
     }
 
-    public abstract T1 getSDfEntity();
+    public abstract T getSDfEntity();
 
     public ETable getPrefix() {
         return prefix;
@@ -38,6 +45,10 @@ public abstract class ObjectTag<T1 extends SpcexObjectBase> {
         return fileName;
     }
 
+    public void setHazelcastService(HazelcastService hazelcastService) {
+        this.hazelcastService = hazelcastService;
+    }
+
     public void setFileName(String fileName) {
         this.fileName = fileName;
     }
@@ -50,14 +61,18 @@ public abstract class ObjectTag<T1 extends SpcexObjectBase> {
         this.generationId = generationId;
     }
 
-    public void insertEntity(ImdgHazelcast<T1> map) {
+    public void injectEntity(T obj) {
-        T1 obj = getSDfEntity();
+        if (map == null) {
-        if (checkOnExisting(obj)) {
+            bootMap();
-            map.insert(obj);
         }
+        map.insert(obj);
     }
 
-    protected boolean checkOnExisting(T1 obj) {
+    public boolean checkOnExisting(T obj) {
         return true;
     }
+
+    protected void bootMap() {
+        map = (ImdgHazelcast<T>) hazelcastService.getImdg(nameOfMap, clazz);
+    }
 }

clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/steps/ImportToDB.java

@@ -1,36 +1,29 @@
 package ru.spcex.clearing.xml.importer.logic.steps;
 
-import com.fasterxml.jackson.dataformat.xml.XmlMapper;
-import java.util.Map;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
+import ru.clearing.classes.statics.data.sdf.SDf57;
 import ru.spcex.clearing.xml.importer.logic.data.ResultContainer;
 import ru.spcex.clearing.xml.importer.logic.data.enums.ETable;
 import ru.spcex.clearing.xml.importer.logic.data.enums.StageResult;
 import ru.spcex.clearing.xml.importer.logic.data.tags.DocumentTag;
 import ru.spcex.clearing.xml.importer.logic.data.tags.objects.ObjectTag;
 import ru.spcex.platform.classes.base.SpcexObjectBase;
-import ru.spcex.platform.imdg.iml.hazelcast.adapter.ImdgHazelcast;
+import ru.spcex.platform.enumeration.ObjectType;
+import ru.spcex.platform.enumeration.Priority;
 import ru.spcex.platform.imdg.iml.hazelcast.service.HazelcastService;
 
 @Component
 public class ImportToDB {
     private final Logger log = LoggerFactory.getLogger(getClass());
-    private final XmlMapper xmlMapper;
     private final HazelcastService hazelcastService;
     private final XmlImportKafkaMessenger kafkaMessenger;
-    private final Map<ETable, ImdgHazelcast<?>> mapOfTable;
 
-    public ImportToDB(@Qualifier("xmlMapper") XmlMapper xmlMapper,
+    public ImportToDB(HazelcastService hazelcastService,
-                      HazelcastService hazelcastService,
+                      XmlImportKafkaMessenger kafkaMessenger) {
-                      XmlImportKafkaMessenger kafkaMessenger,
-                      @Qualifier("mapOfTable") Map<ETable, ImdgHazelcast<?>> mapOfTable) {
-        this.xmlMapper = xmlMapper;
         this.hazelcastService = hazelcastService;
         this.kafkaMessenger = kafkaMessenger;
-        this.mapOfTable = mapOfTable;
     }
 
     public StageResult process(ResultContainer resultContainer) {
@@ -41,10 +34,18 @@ public class ImportToDB {
         String fileName = resultContainer.getXmlFile().getName();
         Long fileId = hazelcastService.getImdgIdGenerator().nextId();
         for (ObjectTag o : documentTag.getObjects()) {
-            ImdgHazelcast<? extends SpcexObjectBase> imdgMap = mapOfTable.get(o.getPrefix());
+            o.setHazelcastService(hazelcastService);
             o.setFileName(fileName);
             o.setGenerationId(fileId);
-            o.insertEntity(imdgMap);
+
+            SpcexObjectBase entityTable = o.getSDfEntity();
+            if (!o.checkOnExisting(entityTable) && entityTable instanceof SDf57) {
+                kafkaMessenger.sendUserNotification(ObjectType.rgst,
+                    "Номер транзакции " + ((SDf57) entityTable).getDbfId() + " в полученном df57 уже был обработан ранее",
+                    Priority.HIGH);
+            } else {
+                o.injectEntity(entityTable);
+            }
         }
 
         if (ETable.DF_01.equals(currTable)) {

clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/steps/XmlImportKafkaMessenger.java

@@ -1,5 +1,7 @@
 package ru.spcex.clearing.xml.importer.logic.steps;
 
+import static ru.spcex.clearing.platform.messaging.domain.Consts.PAIR_SDF;
+
 import java.util.HashMap;
 import java.util.Map;
 import java.util.function.Consumer;
@@ -9,7 +11,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.stereotype.Component;
 import ru.spcex.clearing.platform.messaging.domain.Consts;
-import static ru.spcex.clearing.platform.messaging.domain.Consts.PAIR_SDF;
 import ru.spcex.clearing.platform.messaging.domain.cud.balance.StatementRequest;
 import ru.spcex.clearing.platform.messaging.domain.cud.clearing.Sdf04Request;
 import ru.spcex.clearing.platform.messaging.domain.cud.utilities.NotificationNewRequest;
@@ -76,7 +77,7 @@ public class XmlImportKafkaMessenger implements InitializingBean {
         }
     }
 
-    private void sendUserNotification(ObjectType objectType, String comment, Priority priority) {
+    public void sendUserNotification(ObjectType objectType, String comment, Priority priority) {
         final String destination = Consts.NOTIFICATION_NEW;
         NotificationNewRequest request = new NotificationNewRequest();
         request.setObjectType(objectType.getKey());

clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/services/XMLImporterService.java

@@ -59,7 +59,11 @@ public class XMLImporterService {
     }
 
     public void processTable(ETable specificTable) {
-        log.info("adding import task {}", specificTable == null ? "without specific table" : specificTable);
+        if (specificTable == null) {
+            log.trace("adding import task without specific table");
+        } else {
+            log.info("adding import task {}", specificTable);
+        }
 
         fileChecker.checkAndLoadSFTP();
         executorService.execute(() -> {