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

Merge branch 'feature/SUPPORT-9339_add_sign_verify' of 10.10.31.70:/ervu-lkrp-ul into feature/SUPPORT-9339_add_sign_verify

Browse source
This commit is contained in:
Eduard Tihomiorv 2025-10-15 16:36:52 +03:00
commit a6640abe02
5 changed files with 126 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,8 +8,9 @@ public class JournalDto {
private Integer filePatternCode;
private String senderFio;
private String status;
public Integer filesSentCount;
public Integer acceptedFilesCount;
private Integer rowsCount;
private Integer rowsSuccess;
private Integer rowsError;
public String getDepartureDateTime() {
return departureDateTime;
@ -65,21 +66,30 @@ public class JournalDto {
return this;
}
public Integer getFilesSentCount() {
return filesSentCount;
public Integer getRowsCount() {
return rowsCount;
}
public JournalDto setFilesSentCount(Integer filesSentCount) {
this.filesSentCount = filesSentCount;
public JournalDto setRowsCount(Integer rowsCount) {
this.rowsCount = rowsCount;
return this;
}
public Integer getAcceptedFilesCount() {
return acceptedFilesCount;
public Integer getRowsSuccess() {
return rowsSuccess;
}
public JournalDto setAcceptedFilesCount(Integer acceptedFilesCount) {
this.acceptedFilesCount = acceptedFilesCount;
public JournalDto setRowsSuccess(Integer rowsSuccess) {
this.rowsSuccess = rowsSuccess;
return this;
}
public Integer getRowsError() {
return rowsError;
}
public JournalDto setRowsError(Integer rowsError) {
this.rowsError = rowsError;
return this;
}
}

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

@ -14,6 +14,7 @@ public class JournalFileInfo {
private SenderInfo senderInfo;
private Integer rowsCount; //Общее количество записей отправленных в файле
private Integer rowsSuccess; //Количество записей принятых в файле
private Integer rowsError; //Количество записей непринятых в файле
public List<JournalFileDetails> getPackFiles() {
return packFiles;
@ -51,6 +52,15 @@ public class JournalFileInfo {
return this;
}
public Integer getRowsError() {
return rowsError;
}
public JournalFileInfo setRowsError(Integer rowsError) {
this.rowsError = rowsError;
return this;
}
@JsonIgnoreProperties(ignoreUnknown = true)
public static class JournalFileDetails {
private String fileId; //ИД файла полученный при создании записи о файле в реестр организаций (в ЕРВУ)

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

@ -24,8 +24,9 @@ public class JournalDtoMapper {
)
)
.setStatus(journalFileDetails.getFileStatus().getStatus())
.setFilesSentCount(journalFileInfo.getRowsCount())
.setAcceptedFilesCount(journalFileInfo.getRowsSuccess());
.setRowsCount(journalFileInfo.getRowsCount())
.setRowsSuccess(journalFileInfo.getRowsSuccess())
.setRowsError(journalFileInfo.getRowsError());
}
public static JournalDto mapToJournalDto(InteractionLogRecord record) {
@ -35,8 +36,9 @@ public class JournalDtoMapper {
.setFilePatternCode(Integer.valueOf(record.getForm()))
.setSenderFio(record.getSender())
.setStatus(record.getStatus())
.setFilesSentCount(record.getRecordsSent())
.setAcceptedFilesCount(record.getRecordsAccepted())
.setRowsCount(0)
.setRowsSuccess(0)
.setRowsError(0)
.setFileId(record.getFileId());
}
}

2
backend/src/main/java/ru/micord/ervu/service/InteractionServiceImpl.java
View file

@ -41,8 +41,6 @@ public class InteractionServiceImpl implements InteractionService {
.set(INTERACTION_LOG.SENT_DATE, timestamp)
.set(INTERACTION_LOG.SENDER, sender)
.set(INTERACTION_LOG.FILE_NAME, fileName)
.set(INTERACTION_LOG.RECORDS_SENT, 0)
.set(INTERACTION_LOG.RECORDS_ACCEPTED, 0)
.set(INTERACTION_LOG.ERVU_ID, ervuId)
.execute();
}

92
resources/src/main/resources/business-model/Журнал взаимодействия.page
View file

@ -1489,7 +1489,7 @@
<entry>
<key>column</key>
<value>
<simple>"filesSentCount"</simple>
<simple>"rowsCount"</simple>
</value>
</entry>
<entry>
@ -1577,7 +1577,95 @@
<entry>
<key>column</key>
<value>
<simple>"acceptedFilesCount"</simple>
<simple>"rowsSuccess"</simple>
</value>
</entry>
<entry>
<key>filterType</key>
<value>
<simple>"NUMBER"</simple>
</value>
</entry>
<entry>
<key>type</key>
<value>
<simple>"java.lang.Number"</simple>
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>filter</key>
<value>
<simple>true</simple>
</value>
</entry>
<entry>
<key>sortable</key>
<value>
<simple>true</simple>
</value>
</entry>
<entry>
<key>width</key>
<value>
<simple>80</simple>
</value>
</entry>
<entry>
<key>widthFixed</key>
<value>
<simple>null</simple>
</value>
</entry>
</properties>
</scripts>
</children>
<children id="bc82586d-42e3-4155-b215-a1a8f455c0d7">
<prototypeId>c556264f-221b-4af8-9e64-f380a67c41ec</prototypeId>
<componentRootId>bc82586d-42e3-4155-b215-a1a8f455c0d7</componentRootId>
<name>Записей непринято</name>
<container>false</container>
<childrenReordered>false</childrenReordered>
<scripts id="9c5c7a86-dc40-4b30-a5a7-5e7b4c7ea1e1">
<properties>
<entry>
<key>floatingFilter</key>
<value>
<simple>false</simple>
</value>
</entry>
</properties>
</scripts>
<scripts id="0a01c185-920b-4328-a82d-277f917b185e">
<properties>
<entry>
<key>autoHeight</key>
<value>
<simple>true</simple>
</value>
</entry>
<entry>
<key>displayName</key>
<value>
<simple>"Записей не принято"</simple>
</value>
</entry>
<entry>
<key>displayPopup</key>
<value>
<simple>true</simple>
</value>
</entry>
<entry>
<key>field</key>
<value>
<complex>
<entry>
<key>column</key>
<value>
<simple>"rowsError"</simple>
</value>
</entry>
<entry>