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

Merge branch 'hotfix/1.9.1'

Browse source
This commit is contained in:
Zaripov Emil 2024-11-20 15:20:46 +03:00
commit 2e7fbdc4c1
4 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
backend/src/main/java/ervu/enums/FileStatusCode.java
View file

@ -4,6 +4,7 @@ package ervu.enums;
* @author gulnaz
*/
public enum FileStatusCode {
FILE_UPLOADED("01"),
FILE_INFECTED("02"),
FILE_CLEAN("03"),
FILE_NOT_CHECKED("11");

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

@ -75,9 +75,9 @@ public class EmployeeInfoFileUploadService {
if (this.webDavClient.uploadFile(fileUploadUrl, multipartFile)) {
FileStatus fileStatus = new FileStatus();
fileStatus.setStatus("Загрузка.");
fileStatus.setCode("01");
fileStatus.setDescription("Файл принят до проверки на вирусы.");
fileStatus.setStatus("Загрузка");
fileStatus.setCode(FILE_UPLOADED.getCode());
fileStatus.setDescription("Файл принят до проверки на вирусы");
String fileId = UUID.randomUUID().toString();
String fileName = multipartFile.getOriginalFilename();
EmployeeInfoFileFormType employeeInfoFileFormType = EmployeeInfoFileFormType.valueOf(formType);
@ -107,7 +107,7 @@ public class EmployeeInfoFileUploadService {
interactionService.setStatus(fileId, fileStatus.getStatus(), fileName,
employeeInfoFileFormType.getFilePatternCode(), Timestamp.valueOf(now),
convertToFio(personModel.getFirstName(), personModel.getMiddleName(), personModel.getLastName()),
(int) multipartFile.getSize(), ervuId);
ervuId);
return sendMessage(jsonMessage);
}
else {

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

@ -12,7 +12,7 @@ public interface InteractionService {
List<InteractionLogRecord> get(String ervuId, String[] excludedStatuses);
void setStatus(String fileId, String status, String fileName, String form, Timestamp timestamp, String sender, Integer count, String ervuId);
void setStatus(String fileId, String status, String fileName, String form, Timestamp timestamp, String sender, String ervuId);
void updateStatus(String fileId, String status, String ervuId);

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

@ -32,8 +32,8 @@ public class InteractionServiceImpl implements InteractionService {
.fetch();
}
public void setStatus(String fileId, String status, String fileName, String form, Timestamp timestamp, String sender,
Integer count, String ervuId) {
public void setStatus(String fileId, String status, String fileName, String form,
Timestamp timestamp, String sender, String ervuId) {
dslContext.insertInto(INTERACTION_LOG)
.set(INTERACTION_LOG.FILE_ID, fileId)
.set(INTERACTION_LOG.STATUS, status)
@ -41,7 +41,8 @@ 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, count)
.set(INTERACTION_LOG.RECORDS_SENT, 0)
.set(INTERACTION_LOG.RECORDS_ACCEPTED, 0)
.set(INTERACTION_LOG.ERVU_ID, ervuId)
.execute();
}