micord/ervu-lkrp-ul
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SUPPORT-9156: cut duplicate

Browse source
This commit is contained in:
adel.ka 2025-05-06 13:54:15 +03:00 • committed by Zaripov Emil
parent fe6745a5a1
commit 5a696e94dd
3 changed files with 26 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
backend/src/main/java/ru/micord/ervu/journal/JournalDto.java
View file

@ -2,6 +2,7 @@ package ru.micord.ervu.journal;
public class JournalDto {
private String fileId;
private String departureDateTime;
private String fileName;
private Integer filePatternCode;
@ -19,6 +20,15 @@ public class JournalDto {
return this;
}
public String getFileId() {
return fileId;
}
public JournalDto setFileId(String fileId) {
this.fileId = fileId;
return this;
}
public String getFileName() {
return fileName;
}

23
backend/src/main/java/ru/micord/ervu/journal/mapper/JournalDtoMapper.java
View file

@ -14,15 +14,17 @@ public class JournalDtoMapper {
public static JournalDto mapToJournalDto(JournalFileInfo journalFileInfo) {
SenderInfo senderInfo = journalFileInfo.getSenderInfo();
return new JournalDto()
.setDepartureDateTime(Timestamp.valueOf(journalFileInfo.getDepartureDateTime()).toString())
.setFileName(journalFileInfo.getFileName())
.setFilePatternCode(journalFileInfo.getFilePatternCode())
.setSenderFio(convertToFio(senderInfo.getFirstName(), senderInfo.getMiddleName(),
senderInfo.getLastName())
)
.setStatus(journalFileInfo.getFileStatus().getStatus())
.setFilesSentCount(journalFileInfo.getRowsCount())
.setAcceptedFilesCount(journalFileInfo.getRowsSuccess());
.setFileId(journalFileInfo.getFileId())
.setDepartureDateTime(Timestamp.valueOf(journalFileInfo.getDepartureDateTime()).toString())
.setFileName(journalFileInfo.getFileName())
.setFilePatternCode(journalFileInfo.getFilePatternCode())
.setSenderFio(convertToFio(senderInfo.getFirstName(), senderInfo.getMiddleName(),
senderInfo.getLastName()
)
)
.setStatus(journalFileInfo.getFileStatus().getStatus())
.setFilesSentCount(journalFileInfo.getRowsCount())
.setAcceptedFilesCount(journalFileInfo.getRowsSuccess());
}
public static JournalDto mapToJournalDto(InteractionLogRecord record) {
@ -33,6 +35,7 @@ public class JournalDtoMapper {
.setSenderFio(record.getSender())
.setStatus(record.getStatus())
.setFilesSentCount(record.getRecordsSent())
.setAcceptedFilesCount(record.getRecordsAccepted());
.setAcceptedFilesCount(record.getRecordsAccepted())
.setFileId(record.getFileId());
}
}

3
backend/src/main/java/ru/micord/ervu/service/grid/impl/JournalInMemoryStaticGridLoadService.java
View file

@ -3,6 +3,7 @@ package ru.micord.ervu.service.grid.impl;
import java.util.Arrays;
import java.util.Comparator;
import java.util.List;
import java.util.HashSet;
import java.util.Optional;
import java.util.stream.Stream;
@ -74,7 +75,9 @@ public class JournalInMemoryStaticGridLoadService implements
throw new JsonParsingException("Failed to parse JournalFileDataResponse.", e);
}
HashSet<String> seenFileIds = new HashSet<>();
return Stream.concat(dbJournalList.stream(), ervuJournalList.stream())
.filter(journal -> seenFileIds.add(journal.getFileId()))
.sorted(Comparator.comparing(JournalDto::getDepartureDateTime))
.toList();
}