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

SUPPORT-9339: Fix

Browse source
This commit is contained in:
Eduard Tihomiorv 2025-10-13 13:01:00 +03:00
parent e6f0fb3587
commit ce4d921951
3 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
backend/src/main/java/ervu/FileConstants.java Normal file
View file

@ -0,0 +1,10 @@
package ervu;
/**
* @author Eduard Tihomirov
*/
public final class FileConstants {
public static final String DOCUMENT = "DOCUMENT";
public static final String SIGNATURE = "SIGNATURE";
public static final String MCHD = "MCHD";
}

6
backend/src/main/java/ervu/service/fileupload/EmployeeInfoFileUploadService.java
View file

@ -66,6 +66,9 @@ import ru.micord.ervu.util.DateUtils;
import ru.cg.webbpm.modules.core.runtime.api.LocalizedException;
import ru.cg.webbpm.modules.core.runtime.api.MessageBundleUtils;
import static ervu.FileConstants.DOCUMENT;
import static ervu.FileConstants.MCHD;
import static ervu.FileConstants.SIGNATURE;
import static ervu.enums.FileStatusCode.FILE_ACCEPTED;
import static ervu.enums.FileStatusCode.FILE_INFECTED;
import static ervu.enums.FileStatusCode.FILE_NOT_CHECKED;
@ -80,9 +83,6 @@ import static ru.micord.ervu.util.StringUtils.convertToFio;
@Service
public class EmployeeInfoFileUploadService {
private static final Logger LOGGER = LoggerFactory.getLogger(EmployeeInfoFileUploadService.class);
private static final String DOCUMENT = "DOCUMENT";
private static final String SIGNATURE = "SIGNATURE";
private static final String MCHD = "MCHD";
private static final MessageSourceAccessor MESSAGE_SOURCE = MessageBundleUtils.createAccessor(
"messages/common_errors_messages");
private final WebDavClient webDavClient;

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

@ -25,6 +25,8 @@ import org.springframework.stereotype.Service;
import ru.micord.ervu.kafka.service.ReplyingKafkaService;
import ru.micord.ervu.security.webbpm.jwt.service.JwtTokenService;
import static ervu.FileConstants.DOCUMENT;
@Service
public class JournalInMemoryStaticGridLoadService implements
InMemoryStaticGridLoadService<JournalDto> {
@ -69,7 +71,7 @@ public class JournalInMemoryStaticGridLoadService implements
JournalFileDataResponse.class);
ervuJournalList = journalFileDataResponse.getFilesInfo().stream()
.flatMap(fileInfo -> fileInfo.getPackFiles().stream()
.filter(fileDetail -> "DOCUMENT".equals(fileDetail.getType()))
.filter(fileDetail -> DOCUMENT.equals(fileDetail.getType()))
.map(fileDetail -> JournalDtoMapper.mapToJournalDto(fileInfo, fileDetail))
)
.toList();