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

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

Browse source
This commit is contained in:
ialbert 2026-04-20 17:20:09 +03:00
parent 1442ab6c50
commit 0e9deb8ab0
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clearing-parent/csv-importer/src/main/java/ru/spcex/clearing/csv/importer/component/FileService.java
View file

@ -58,7 +58,7 @@ public class FileService {
public static void checkDir(Path dir) { public static void checkDir(Path dir) {
if (!dir.toFile().exists() || !dir.toFile().isDirectory()) { if (!dir.toFile().exists() || !dir.toFile().isDirectory()) {
throw new IllegalStateException("directory " + dir + " is not a directory"); throw new IllegalStateException("'" + dir + "' is not a directory");
} }
} }
} }

4
clearing-parent/csv-importer/src/main/java/ru/spcex/clearing/csv/importer/component/tro/processor/TroProcessor.java
View file

@ -25,7 +25,6 @@ public class TroProcessor<T> {
while ((line = reader.readLine()) != null) { while ((line = reader.readLine()) != null) {
lineNumber++; lineNumber++;
// быстрый skip пустых строк
if (line.isBlank()) { if (line.isBlank()) {
continue; continue;
} }
@ -35,8 +34,7 @@ public class TroProcessor<T> {
result.add(parsed); result.add(parsed);
} catch (Exception e) { } catch (Exception e) {
throw new RuntimeException( throw new RuntimeException(
"Failed to parse TRO line " + lineNumber + ": " + line, "Failed to parse TRO line " + lineNumber + ": " + line, e
e
); );
} }
} }

2
clearing-parent/csv-importer/src/main/java/ru/spcex/clearing/csv/importer/service/SOrdersScheduler.java
View file

@ -11,6 +11,7 @@ import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import ru.clearing.classes.statics.data.misc.SOrders; import ru.clearing.classes.statics.data.misc.SOrders;
import ru.spcex.clearing.csv.importer.component.FileService; import ru.spcex.clearing.csv.importer.component.FileService;
import static ru.spcex.clearing.csv.importer.component.FileService.checkDir;
import ru.spcex.clearing.csv.importer.component.tro.data.SOrder; import ru.spcex.clearing.csv.importer.component.tro.data.SOrder;
import ru.spcex.clearing.csv.importer.component.tro.parser.TroParserType; import ru.spcex.clearing.csv.importer.component.tro.parser.TroParserType;
import ru.spcex.clearing.csv.importer.component.tro.processor.TroProcessor; import ru.spcex.clearing.csv.importer.component.tro.processor.TroProcessor;
@ -38,6 +39,7 @@ public class SOrdersScheduler {
@Autowired @Autowired
public SOrdersScheduler(CsvImporterSettings settings, FileService fileService, TroProcessorProvider provider, ImdgProvider imdgProvider, KafkaSender kafkaSender) { public SOrdersScheduler(CsvImporterSettings settings, FileService fileService, TroProcessorProvider provider, ImdgProvider imdgProvider, KafkaSender kafkaSender) {
this.importDir = Path.of(settings.getSrcDir()); this.importDir = Path.of(settings.getSrcDir());
checkDir(importDir);
this.fileService = fileService; this.fileService = fileService;
this.processor = provider.createProcessor(TroParserType.SOrder, SOrder.class); this.processor = provider.createProcessor(TroParserType.SOrder, SOrder.class);
this.sOrderImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_SOrders, SOrders.class); this.sOrderImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_SOrders, SOrders.class);