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

http://jira.mfd.msk:8088/browse/CLS-313

Browse source 
Исправил ошибки.
This commit is contained in:
psemenkov 2023-05-19 18:35:26 +03:00
parent f7b129bf24
commit 8755f3e1ca
3 changed files with 43 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/config/KafkaSenderConfig.java
View file

@ -40,7 +40,6 @@ public class KafkaSenderConfig {
return KafkaProducerFactory.producerFactory(kafkaSettings); return KafkaProducerFactory.producerFactory(kafkaSettings);
} }
// @Autowired(required = false)
@Bean("kafkaTemplate") @Bean("kafkaTemplate")
public KafkaTemplate<String, Object> kafkaTemplate(ProducerFactory<String, Object> pf) { public KafkaTemplate<String, Object> kafkaTemplate(ProducerFactory<String, Object> pf) {
if (pf == null) { if (pf == null) {
@ -49,19 +48,18 @@ public class KafkaSenderConfig {
return new KafkaTemplate<>(pf); return new KafkaTemplate<>(pf);
} }
// @Autowired(required = false) @Bean
@Bean public Supplier<KafkaSender> kafkaSenderSupplier(KafkaTemplate<String, Object> kafkaTemplate,
public Supplier<KafkaSender> kafkaSenderSupplier(KafkaTemplate<String, Object> kafkaTemplate, ImdgProvider imdgProvider) {
ImdgProvider imdgProvider) { ImdgId imdgIdGenerator = imdgProvider.getImdgIdGenerator();
ImdgId imdgIdGenerator = imdgProvider.getImdgIdGenerator(); return () -> KafkaSender
return () -> KafkaSender .setup()
.setup() .setKafkaTemplate(kafkaTemplate)
.setKafkaTemplate(kafkaTemplate) .idGenerator(imdgIdGenerator::nextId)
.idGenerator(imdgIdGenerator::nextId) .imdgProvider(s -> {
.imdgProvider(s -> { Imdg<RequestInfo> imdg = imdgProvider.getImdg(IMDGDistributedNames.Map_RequestInfo, RequestInfo.class);
Imdg<RequestInfo> imdg = imdgProvider.getImdg(IMDGDistributedNames.Map_RequestInfo, RequestInfo.class); return imdg::insert;
return imdg::insert; })
}) .build();
.build(); }
}
} }

1
clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/data/enums/FilenameTemplate.java
View file

@ -77,6 +77,7 @@ public enum FilenameTemplate {
int res = 0; int res = 0;
String timestampNow = utilFormatter.format(LocalDateTime.now()); String timestampNow = utilFormatter.format(LocalDateTime.now());
for (SftpFileInfo file : files) { for (SftpFileInfo file : files) {
if (file.isDirectory()) continue;
String name = file.getFilename(); String name = file.getFilename();
String[] splitName = name.split("_"); String[] splitName = name.split("_");
if (splitName.length < 3) if (splitName.length < 3)

28
clearing-parent/dbf-exporter/src/test/java/ru/spcex/clearing/dbf/exporter/logic/data/enums/FilenameTemplateTest.java Normal file
View file

@ -0,0 +1,28 @@
package ru.spcex.clearing.dbf.exporter.logic.data.enums;
import com.jcraft.jsch.ChannelSftp.LsEntry;
import org.junit.jupiter.api.Test;
import org.springframework.integration.sftp.session.SftpFileInfo;
import java.util.List;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.*;
class FilenameTemplateTest {
@Test
void countSameFilesInDir() {
LsEntry lsEntry = mock(LsEntry.class);
doReturn("DF-02_S_PRC2305191321_1.DBF").when(lsEntry).getFilename();
SftpFileInfo sftpFileInfo = spy(new SftpFileInfo(lsEntry));
doReturn(false).when(sftpFileInfo).isDirectory();
List<SftpFileInfo> files = List.of(sftpFileInfo);
int count = FilenameTemplate.df_section_dateTime.countSameFilesInDir("DF-02", files);
assertEquals(1, count);
// doReturn("DF-02_S_PRC230").when(lsEntry).getFilename();
// count = FilenameTemplate.df_section_dateTime.countSameFilesInDir("DF-02", files);
// assertEquals(0, count);
}
}