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

Merge branch 'feature/SUPPORT-8470_status' into feature/SUPPORT-8411_fixed

Browse source 
# Conflicts:
#	backend/src/main/java/ru/micord/ervu/kafka/ReplyingKafkaConfig.java
This commit is contained in:
gulnaz 2024-09-13 13:01:22 +03:00
commit d94e45c970
39 changed files with 1829 additions and 336 deletions
Download patch file Download diff file Expand all files Collapse all files

18
backend/src/main/java/ervu/KafkaProducerConfig.java
View file

@ -19,25 +19,25 @@ import org.springframework.kafka.core.ProducerFactory;
*/
//@Configuration
public class KafkaProducerConfig {
@Value("${kafka.send.url}")
@Value("${av-kafka.send.url}")
private String kafkaUrl;
@Value("${kafka.send.security.protocol}")
@Value("${av-kafka.send.security.protocol}")
private String securityProtocol;
@Value("${kafka.send.login.module:org.apache.kafka.common.security.scram.ScramLoginModule}")
@Value("${av-kafka.send.login.module:org.apache.kafka.common.security.scram.ScramLoginModule}")
private String loginModule;
@Value("${kafka.send.username}")
@Value("${av-kafka.send.username}")
private String username;
@Value("${kafka.send.password}")
@Value("${av-kafka.send.password}")
private String password;
@Value("${kafka.sasl.mechanism}")
@Value("${av-kafka.sasl.mechanism}")
private String saslMechanism;
@Bean
@Bean("av-factory")
public ProducerFactory<String, String> producerFactory() {
return new DefaultKafkaProducerFactory<>(producerConfigs());
}
@Bean
@Bean("av-configs")
public Map<String, Object> producerConfigs() {
Map<String, Object> props = new HashMap<>();
props.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, this.kafkaUrl);
@ -52,7 +52,7 @@ public class KafkaProducerConfig {
return props;
}
@Bean
@Bean("av-template")
public KafkaTemplate<String, String> kafkaTemplate() {
return new KafkaTemplate<>(producerFactory());
}

20
backend/src/main/java/ervu/controller/EmployeeInfoFileUploadController.java
View file

@ -1,5 +1,8 @@
package ervu.controller;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import ervu.service.fileupload.EmployeeInfoFileUploadService;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
@ -18,8 +21,21 @@ public class EmployeeInfoFileUploadController {
@RequestMapping(value = "/employee/document", method = RequestMethod.POST)
public ResponseEntity<?> saveEmployeeInformationFile(@RequestParam("file") MultipartFile multipartFile,
@RequestHeader("X-Employee-Info-File-Form-Type") String formType) {
if (this.fileUploadService.saveEmployeeInformationFile(multipartFile, formType)) {
@RequestHeader("X-Employee-Info-File-Form-Type") String formType, HttpServletRequest request) {
String accessToken = null;
String authToken = null;
Cookie[] cookies = request.getCookies();
if (cookies != null) {
for (Cookie cookie : cookies) {
if (cookie.getName().equals("access_token")) {
accessToken = cookie.getValue();
}
else if (cookie.getName().equals("auth_token")) {
authToken = cookie.getValue();
}
}
}
if (accessToken != null && this.fileUploadService.saveEmployeeInformationFile(multipartFile, formType, accessToken, authToken)) {
return ResponseEntity.ok("File successfully uploaded.");
}
else {

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

@ -1,6 +1,8 @@
package ervu.service.fileupload;
import java.sql.Timestamp;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.UUID;
@ -8,13 +10,22 @@ import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import ervu.client.fileupload.FileUploadWebDavClient;
import ervu.service.fileupload.model.EmployeeInfoKafkaMessage;
import ervu.service.fileupload.model.FileStatus;
import org.apache.kafka.clients.producer.ProducerRecord;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.kafka.core.KafkaTemplate;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import ru.micord.ervu.security.esia.model.EmployeeModel;
import ru.micord.ervu.security.esia.model.PersonModel;
import ru.micord.ervu.security.esia.service.UlDataService;
import ru.micord.ervu.security.webbpm.jwt.model.Token;
import ru.micord.ervu.security.webbpm.jwt.service.JwtTokenService;
import ru.micord.ervu.service.StatusService;
/**
* @author Alexandr Shalaginov
@ -22,12 +33,16 @@ import org.springframework.web.multipart.MultipartFile;
@Service
public class EmployeeInfoFileUploadService {
private static final Logger logger = LoggerFactory.getLogger(EmployeeInfoFileUploadService.class);
private static final String FORMAT = "dd.MM.yyyy HH:mm";
private final FileUploadWebDavClient fileWebDavUploadClient;
private final EmployeeInfoKafkaMessageService employeeInfoKafkaMessageService;
private final KafkaTemplate<String, String> kafkaTemplate;
private final StatusService statusService;
private final UlDataService ulDataService;
private final JwtTokenService jwtTokenService;
@Value("${kafka.send.message.topic.name:employee-files}")
@Value("${av-kafka.send.message.topic.name:employee-files}")
private String kafkaTopicName;
@Value("${file.webdav.upload.url:http://localhost:5757}")
private String url;
@ -38,25 +53,49 @@ public class EmployeeInfoFileUploadService {
public EmployeeInfoFileUploadService(
FileUploadWebDavClient fileWebDavUploadClient,
EmployeeInfoKafkaMessageService employeeInfoKafkaMessageService, KafkaTemplate<String, String> kafkaTemplate) {
EmployeeInfoKafkaMessageService employeeInfoKafkaMessageService,
@Qualifier("av-template") KafkaTemplate<String, String> kafkaTemplate, StatusService statusService,
UlDataService ulDataService, JwtTokenService jwtTokenService) {
this.fileWebDavUploadClient = fileWebDavUploadClient;
this.employeeInfoKafkaMessageService = employeeInfoKafkaMessageService;
this.kafkaTemplate = kafkaTemplate;
this.statusService = statusService;
this.ulDataService = ulDataService;
this.jwtTokenService = jwtTokenService;
}
public boolean saveEmployeeInformationFile(MultipartFile multipartFile, String formType) {
public boolean saveEmployeeInformationFile(MultipartFile multipartFile, String formType,
String accessToken, String authToken) {
String fileUploadUrl = this.url + "/" + getNewFilename(multipartFile.getOriginalFilename());
String departureDateTime = getDepartureDateTime();
LocalDateTime now = LocalDateTime.now();
String departureDateTime = now.format(DateTimeFormatter.ofPattern(FORMAT));;
String timeZone = getTimeZone();
if (this.fileWebDavUploadClient.webDavUploadFile(fileUploadUrl, username, password, multipartFile)) {
FileStatus fileStatus = new FileStatus();
fileStatus.setStatus("Загрузка.");
fileStatus.setCode("01");
fileStatus.setDescription("Файл принят до проверки на вирусы.");
String fileId = UUID.randomUUID().toString();
String fileName = multipartFile.getOriginalFilename();
EmployeeInfoFileFormType employeeInfoFileFormType = EmployeeInfoFileFormType.valueOf(formType);
String jsonMessage = getJsonKafkaMessage(
employeeInfoKafkaMessageService.getKafkaMessage(
fileId,
fileUploadUrl,
multipartFile.getOriginalFilename(),
EmployeeInfoFileFormType.valueOf(formType),
departureDateTime
fileName,
employeeInfoFileFormType,
departureDateTime,
accessToken, authToken, timeZone, fileStatus
)
);
EmployeeModel employeeModel = ulDataService.getEmployeeModel(accessToken);
PersonModel personModel = employeeModel.getPerson();
Token token = jwtTokenService.getToken(authToken);
String[] ids = token.getUserAccountId().split(":");
statusService.setStatus(fileId, fileStatus.getStatus(), fileName, employeeInfoFileFormType.getFilePatternName(), Timestamp.valueOf(now),
personModel.getLastName() + " " + personModel.getFirstName().charAt(0) + ". " + personModel.getMiddleName().charAt(0) + ".", (int) multipartFile.getSize(),
ids[1]);
return sendMessage(jsonMessage);
}
else {
@ -100,7 +139,7 @@ public class EmployeeInfoFileUploadService {
}
}
private String getDepartureDateTime() {
return LocalDateTime.now().format(DateTimeFormatter.ofPattern("dd.MM.yyyy HH:mm"));
private String getTimeZone() {
return ZonedDateTime.now().getOffset().toString();
}
}

80
backend/src/main/java/ervu/service/fileupload/EmployeeInfoKafkaMessageService.java
View file

@ -2,10 +2,13 @@ package ervu.service.fileupload;
import ervu.service.fileupload.model.EmployeeInfoKafkaMessage;
import ervu.service.fileupload.model.FileInfo;
import ervu.service.fileupload.model.FileStatus;
import ervu.service.fileupload.model.OrgInfo;
import ervu.service.fileupload.model.SenderInfo;
import ru.micord.ervu.security.esia.service.UlDataService;
import org.springframework.stereotype.Service;
import ru.micord.ervu.security.esia.model.OrganizationModel;
import ru.micord.ervu.security.esia.service.UlDataService;
import ru.micord.ervu.security.webbpm.jwt.model.Token;
import ru.micord.ervu.security.webbpm.jwt.service.JwtTokenService;
/**
* @author Alexandr Shalaginov
@ -13,67 +16,50 @@ import org.springframework.stereotype.Service;
@Service
public class EmployeeInfoKafkaMessageService {
private final UlDataService ulDataService;
private final JwtTokenService jwtTokenService;
public EmployeeInfoKafkaMessageService(UlDataService ulDataService) {
public EmployeeInfoKafkaMessageService(UlDataService ulDataService, JwtTokenService jwtTokenService) {
this.ulDataService = ulDataService;
this.jwtTokenService = jwtTokenService;
}
public EmployeeInfoKafkaMessage getKafkaMessage(String fileNameBase, String fileName,
EmployeeInfoFileFormType formType, String departureDateTime) {
public EmployeeInfoKafkaMessage getKafkaMessage(String fileId, String fileUrl, String fileName,
EmployeeInfoFileFormType formType, String departureDateTime, String accessToken,
String authToken, String timeZone, FileStatus fileStatus) {
return new EmployeeInfoKafkaMessage(
getOrgInfo(),
getSenderInfo(),
getOrgInfo(accessToken, authToken),
getFileInfo(
fileNameBase,
fileId,
fileUrl,
fileName,
formType,
departureDateTime
departureDateTime,
timeZone,
fileStatus
)
);
}
//TODO: refactor SUPPORT-8381
private OrgInfo getOrgInfo() {
// OrganizationModel organizationModel = ulDataService.getOrganizationModel();
// return new OrgInfo(
// organizationModel.getShortName(),
// organizationModel.getLeg(),
// organizationModel.getLegName(),
// organizationModel.getOgrn(),
// organizationModel.getInn(),
// organizationModel.getKpp()
// );
return null;
}
private SenderInfo getSenderInfo() {
// MillitaryRegistrationPersonModel personModel = ulDataService.getPersonModel();
// return new SenderInfo(
// personModel.getLastName(),
// personModel.getFirstName(),
// personModel.getMiddleName(),
// personModel.getBirthday(),
// personModel.getRoleCode(),
// personModel.getRoleName(),
// personModel.getSnils(),
// personModel.getIdERN(),
// new PassportInfo(
// personModel.getPassportSeries(),
// personModel.getPassportNumber(),
// personModel.getPassportIssueDate()
// )
// );
return null;
}
private FileInfo getFileInfo(String fileNameBase, String fileName,
EmployeeInfoFileFormType formType, String departureDateTime) {
private FileInfo getFileInfo(String fileId, String fileUrl, String fileName,
EmployeeInfoFileFormType formType, String departureDateTime, String timeZone,
FileStatus fileStatus) {
return new FileInfo(
fileNameBase,
fileId,
fileUrl,
fileName,
formType.getFilePatternCode(),
formType.getFilePatternName(),
departureDateTime
departureDateTime,
timeZone,
fileStatus
);
}
private OrgInfo getOrgInfo(String accessToken, String authToken) {
OrganizationModel organizationModel = ulDataService.getOrganizationModel(accessToken);
Token token = jwtTokenService.getToken(authToken);
String[] ids = token.getUserAccountId().split(":");
return new OrgInfo(organizationModel.getFullName(), ids[1], ids[0]);
}
}

15
backend/src/main/java/ervu/service/fileupload/model/EmployeeInfoKafkaMessage.java
View file

@ -7,12 +7,10 @@ import java.util.Objects;
*/
public class EmployeeInfoKafkaMessage {
private final OrgInfo orgInfo;
private final SenderInfo senderInfo;
private final FileInfo fileInfo;
public EmployeeInfoKafkaMessage(OrgInfo orgInfo, SenderInfo senderInfo, FileInfo fileInfo) {
public EmployeeInfoKafkaMessage(OrgInfo orgInfo, FileInfo fileInfo) {
this.orgInfo = orgInfo;
this.senderInfo = senderInfo;
this.fileInfo = fileInfo;
}
@ -20,10 +18,6 @@ public class EmployeeInfoKafkaMessage {
return orgInfo;
}
public SenderInfo getSenderInfo() {
return senderInfo;
}
public FileInfo getFileInfo() {
return fileInfo;
}
@ -33,21 +27,18 @@ public class EmployeeInfoKafkaMessage {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
EmployeeInfoKafkaMessage that = (EmployeeInfoKafkaMessage) o;
return Objects.equals(orgInfo, that.orgInfo) && Objects.equals(senderInfo,
that.senderInfo
) && Objects.equals(fileInfo, that.fileInfo);
return Objects.equals(orgInfo, that.orgInfo) && Objects.equals(fileInfo, that.fileInfo);
}
@Override
public int hashCode() {
return Objects.hash(orgInfo, senderInfo, fileInfo);
return Objects.hash(orgInfo, fileInfo);
}
@Override
public String toString() {
return "KafkaMessage{" +
"orgInfo=" + orgInfo +
", senderInfo=" + senderInfo +
", fileInfo=" + fileInfo +
'}';
}

39
backend/src/main/java/ervu/service/fileupload/model/FileInfo.java
View file

@ -6,23 +6,33 @@ import java.util.Objects;
* @author Alexandr Shalaginov
*/
public class FileInfo {
private final String fileNameBase;
private final String fileId;
private final String fileUrl;
private final String fileName;
private final String filePatternCode;
private final String filePatternName;
private final String departureDateTime;
private final String timeZone;
private final FileStatus fileStatus;
public FileInfo(String fileNameBase, String fileName, String filePatternCode,
String filePatternName, String departureDateTime) {
this.fileNameBase = fileNameBase;
public FileInfo(String fileId, String fileUrl, String fileName, String filePatternCode,
String filePatternName, String departureDateTime, String timeZone, FileStatus fileStatus) {
this.fileId = fileId;
this.fileUrl = fileUrl;
this.fileName = fileName;
this.filePatternCode = filePatternCode;
this.filePatternName = filePatternName;
this.departureDateTime = departureDateTime;
this.timeZone = timeZone;
this.fileStatus = fileStatus;
}
public String getFileNameBase() {
return fileNameBase;
public String getFileId() {
return fileId;
}
public String getFileUrl() {
return fileUrl;
}
public String getFileName() {
@ -41,12 +51,22 @@ public class FileInfo {
return departureDateTime;
}
public String getTimeZone() {
return timeZone;
}
public FileStatus getFileStatus() {
return fileStatus;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
FileInfo fileInfo = (FileInfo) o;
return Objects.equals(fileNameBase, fileInfo.fileNameBase) && Objects.equals(
return Objects.equals(fileId, fileInfo.fileId) && Objects.equals(fileUrl,
fileInfo.fileUrl
) && Objects.equals(
fileName, fileInfo.fileName) && Objects.equals(filePatternCode,
fileInfo.filePatternCode
) && Objects.equals(filePatternName, fileInfo.filePatternName)
@ -55,7 +75,7 @@ public class FileInfo {
@Override
public int hashCode() {
return Objects.hash(fileNameBase, fileName, filePatternCode, filePatternName,
return Objects.hash(fileId, fileUrl, fileName, filePatternCode, filePatternName,
departureDateTime
);
}
@ -63,7 +83,8 @@ public class FileInfo {
@Override
public String toString() {
return "FileInfo{" +
"fileNameBase='" + fileNameBase + '\'' +
"fileId='" + fileId + '\'' +
", fileNameBase='" + fileUrl + '\'' +
", fileName='" + fileName + '\'' +
", filePatternCode='" + filePatternCode + '\'' +
", filePatternName='" + filePatternName + '\'' +

37
backend/src/main/java/ervu/service/fileupload/model/FileStatus.java Normal file
View file

@ -0,0 +1,37 @@
package ervu.service.fileupload.model;
import java.io.Serializable;
/**
* @author Eduard Tihomirov
*/
public class FileStatus {
private String code;
private String status;
private String description;
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
public String getDescription() {
return description;
}
public void setDescription(String description) {
this.description = description;
}
}

54
backend/src/main/java/ervu/service/fileupload/model/OrgInfo.java
View file

@ -7,44 +7,25 @@ import java.util.Objects;
*/
public class OrgInfo {
private final String orgName;
private final String orgTypeCode;
private final String orgTypeName;
private final String ogrn;
private final String inn;
private final String kpp;
private final String orgId;
private final String prnOid;
public OrgInfo(String orgName, String orgTypeCode, String orgTypeName, String ogrn, String inn,
String kpp) {
public OrgInfo(String orgName, String orgId, String prnOid) {
this.orgName = orgName;
this.orgTypeCode = orgTypeCode;
this.orgTypeName = orgTypeName;
this.ogrn = ogrn;
this.inn = inn;
this.kpp = kpp;
this.orgId = orgId;
this.prnOid = prnOid;
}
public String getOrgName() {
return orgName;
}
public String getOrgTypeCode() {
return orgTypeCode;
public String getOrgId() {
return orgId;
}
public String getOrgTypeName() {
return orgTypeName;
}
public String getOgrn() {
return ogrn;
}
public String getInn() {
return inn;
}
public String getKpp() {
return kpp;
public String getPrnOid() {
return prnOid;
}
@Override
@ -52,27 +33,22 @@ public class OrgInfo {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
OrgInfo orgInfo = (OrgInfo) o;
return Objects.equals(orgName, orgInfo.orgName) && Objects.equals(orgTypeCode,
orgInfo.orgTypeCode
) && Objects.equals(orgTypeName, orgInfo.orgTypeName) && Objects.equals(ogrn,
orgInfo.ogrn
) && Objects.equals(inn, orgInfo.inn) && Objects.equals(kpp, orgInfo.kpp);
return Objects.equals(orgName, orgInfo.orgName) && Objects.equals(orgId,
orgInfo.orgId
) && Objects.equals(prnOid, orgInfo.prnOid);
}
@Override
public int hashCode() {
return Objects.hash(orgName, orgTypeCode, orgTypeName, ogrn, inn, kpp);
return Objects.hash(orgName, orgId, prnOid);
}
@Override
public String toString() {
return "OrgInfo{" +
"orgName='" + orgName + '\'' +
", orgTypeCode='" + orgTypeCode + '\'' +
", orgTypeName='" + orgTypeName + '\'' +
", ogrn='" + ogrn + '\'' +
", inn='" + inn + '\'' +
", kpp='" + kpp + '\'' +
", orgId='" + orgId + '\'' +
", prnOid='" + prnOid + '\'' +
'}';
}
}

54
backend/src/main/java/ervu/service/fileupload/model/PassportInfo.java
View file

@ -1,54 +0,0 @@
package ervu.service.fileupload.model;
import java.util.Objects;
/**
* @author Alexandr Shalaginov
*/
public class PassportInfo {
private final String series;
private final String number;
private final String issueDate;
public PassportInfo(String series, String number, String issueDate) {
this.series = series;
this.number = number;
this.issueDate = issueDate;
}
public String getSeries() {
return series;
}
public String getNumber() {
return number;
}
public String getIssueDate() {
return issueDate;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
PassportInfo that = (PassportInfo) o;
return Objects.equals(series, that.series) && Objects.equals(number,
that.number
) && Objects.equals(issueDate, that.issueDate);
}
@Override
public int hashCode() {
return Objects.hash(series, number, issueDate);
}
@Override
public String toString() {
return "PassportInfo{" +
"series='" + series + '\'' +
", number='" + number + '\'' +
", issueDate='" + issueDate + '\'' +
'}';
}
}

106
backend/src/main/java/ervu/service/fileupload/model/SenderInfo.java
View file

@ -1,106 +0,0 @@
package ervu.service.fileupload.model;
import java.util.Objects;
/**
* @author Alexandr Shalaginov
*/
public class SenderInfo {
private final String senderLastName;
private final String senderFirstName;
private final String senderMiddleName;
private final String birthDate;
private final String senderRoleCode;
private final String senderRoleName;
private final String snils;
private final String idERN;
private final PassportInfo document;
public SenderInfo(String senderLastName, String senderFirstName, String senderMiddleName,
String birthDate, String senderRoleCode, String senderRoleName, String snils, String idERN,
PassportInfo document) {
this.senderLastName = senderLastName;
this.senderFirstName = senderFirstName;
this.senderMiddleName = senderMiddleName;
this.birthDate = birthDate;
this.senderRoleCode = senderRoleCode;
this.senderRoleName = senderRoleName;
this.snils = snils;
this.idERN = idERN;
this.document = document;
}
public String getSenderLastName() {
return senderLastName;
}
public String getSenderFirstName() {
return senderFirstName;
}
public String getSenderMiddleName() {
return senderMiddleName;
}
public String getBirthDate() {
return birthDate;
}
public String getSenderRoleCode() {
return senderRoleCode;
}
public String getSenderRoleName() {
return senderRoleName;
}
public String getSnils() {
return snils;
}
public String getIdERN() {
return idERN;
}
public PassportInfo getDocument() {
return document;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
SenderInfo that = (SenderInfo) o;
return Objects.equals(senderLastName, that.senderLastName) && Objects.equals(
senderFirstName, that.senderFirstName) && Objects.equals(senderMiddleName,
that.senderMiddleName
) && Objects.equals(birthDate, that.birthDate) && Objects.equals(
senderRoleCode, that.senderRoleCode) && Objects.equals(senderRoleName,
that.senderRoleName
) && Objects.equals(snils, that.snils) && Objects.equals(idERN, that.idERN)
&& Objects.equals(document, that.document);
}
@Override
public int hashCode() {
return Objects.hash(senderLastName, senderFirstName, senderMiddleName, birthDate,
senderRoleCode,
senderRoleName, snils, idERN, document
);
}
@Override
public String toString() {
return "SenderInfo{" +
"senderLastName='" + senderLastName + '\'' +
", senderFirstName='" + senderFirstName + '\'' +
", senderMiddleName='" + senderMiddleName + '\'' +
", birthDate='" + birthDate + '\'' +
", senderRoleCode='" + senderRoleCode + '\'' +
", senderRoleName='" + senderRoleName + '\'' +
", snils='" + snils + '\'' +
", idERN='" + idERN + '\'' +
", document=" + document +
'}';
}
}

7
backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/Keys.java
View file

@ -4,9 +4,13 @@
package ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.Files;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.InteractionLog;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.OkopfRecords;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.OrgOkved;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.records.FilesRecord;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.records.InteractionLogRecord;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.records.OkopfRecordsRecord;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.records.OrgOkvedRecord;
import org.jooq.TableField;
@ -26,6 +30,9 @@ public class Keys {
// UNIQUE and PRIMARY KEY definitions
// -------------------------------------------------------------------------
public static final UniqueKey<FilesRecord> FILES_PKEY = Internal.createUniqueKey(Files.FILES, DSL.name("files_pkey"), new TableField[] { Files.FILES.FILE_ID }, true);
public static final UniqueKey<InteractionLogRecord> INTERACTION_LOG_PKEY = Internal.createUniqueKey(InteractionLog.INTERACTION_LOG, DSL.name("interaction_log_pkey"), new TableField[] { InteractionLog.INTERACTION_LOG.ID }, true);
public static final UniqueKey<OkopfRecordsRecord> OKOPF_RECORDS_NAME_KEY = Internal.createUniqueKey(OkopfRecords.OKOPF_RECORDS, DSL.name("okopf_records_name_key"), new TableField[] { OkopfRecords.OKOPF_RECORDS.NAME }, true);
public static final UniqueKey<OkopfRecordsRecord> OKOPF_RECORDS_PKEY = Internal.createUniqueKey(OkopfRecords.OKOPF_RECORDS, DSL.name("okopf_records_pkey"), new TableField[] { OkopfRecords.OKOPF_RECORDS.OKOPF_RECORDS_ID }, true);
public static final UniqueKey<OrgOkvedRecord> ORG_OKVED_PKEY = Internal.createUniqueKey(OrgOkved.ORG_OKVED, DSL.name("org_okved_pkey"), new TableField[] { OrgOkved.ORG_OKVED.ID }, true);
}

14
backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/Public.java
View file

@ -5,7 +5,9 @@ package ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.DefaultCatalog;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.Files;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.InteractionLog;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.OkopfRecords;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.OrgOkved;
import java.util.Arrays;
@ -29,11 +31,21 @@ public class Public extends SchemaImpl {
*/
public static final Public PUBLIC = new Public();
/**
* The table <code>public.files</code>.
*/
public final Files FILES = Files.FILES;
/**
* The table <code>public.interaction_log</code>.
*/
public final InteractionLog INTERACTION_LOG = InteractionLog.INTERACTION_LOG;
/**
* The table <code>public.okopf_records</code>.
*/
public final OkopfRecords OKOPF_RECORDS = OkopfRecords.OKOPF_RECORDS;
/**
* The table <code>public.org_okved</code>.
*/
@ -55,7 +67,9 @@ public class Public extends SchemaImpl {
@Override
public final List<Table<?>> getTables() {
return Arrays.asList(
Files.FILES,
InteractionLog.INTERACTION_LOG,
OkopfRecords.OKOPF_RECORDS,
OrgOkved.ORG_OKVED
);
}

285
backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/Routines.java Normal file
View file

@ -0,0 +1,285 @@
/*
* This file is generated by jOOQ.
*/
package ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.routines.UuidGenerateV1;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.routines.UuidGenerateV1mc;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.routines.UuidGenerateV3;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.routines.UuidGenerateV4;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.routines.UuidGenerateV5;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.routines.UuidNil;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.routines.UuidNsDns;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.routines.UuidNsOid;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.routines.UuidNsUrl;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.routines.UuidNsX500;
import java.util.UUID;
import org.jooq.Configuration;
import org.jooq.Field;
/**
* Convenience access to all stored procedures and functions in public.
*/
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Routines {
/**
* Call <code>public.uuid_generate_v1</code>
*/
public static UUID uuidGenerateV1(
Configuration configuration
) {
UuidGenerateV1 f = new UuidGenerateV1();
f.execute(configuration);
return f.getReturnValue();
}
/**
* Get <code>public.uuid_generate_v1</code> as a field.
*/
public static Field<UUID> uuidGenerateV1() {
UuidGenerateV1 f = new UuidGenerateV1();
return f.asField();
}
/**
* Call <code>public.uuid_generate_v1mc</code>
*/
public static UUID uuidGenerateV1mc(
Configuration configuration
) {
UuidGenerateV1mc f = new UuidGenerateV1mc();
f.execute(configuration);
return f.getReturnValue();
}
/**
* Get <code>public.uuid_generate_v1mc</code> as a field.
*/
public static Field<UUID> uuidGenerateV1mc() {
UuidGenerateV1mc f = new UuidGenerateV1mc();
return f.asField();
}
/**
* Call <code>public.uuid_generate_v3</code>
*/
public static UUID uuidGenerateV3(
Configuration configuration
, UUID namespace
, String name
) {
UuidGenerateV3 f = new UuidGenerateV3();
f.setNamespace(namespace);
f.setName_(name);
f.execute(configuration);
return f.getReturnValue();
}
/**
* Get <code>public.uuid_generate_v3</code> as a field.
*/
public static Field<UUID> uuidGenerateV3(
UUID namespace
, String name
) {
UuidGenerateV3 f = new UuidGenerateV3();
f.setNamespace(namespace);
f.setName_(name);
return f.asField();
}
/**
* Get <code>public.uuid_generate_v3</code> as a field.
*/
public static Field<UUID> uuidGenerateV3(
Field<UUID> namespace
, Field<String> name
) {
UuidGenerateV3 f = new UuidGenerateV3();
f.setNamespace(namespace);
f.setName_(name);
return f.asField();
}
/**
* Call <code>public.uuid_generate_v4</code>
*/
public static UUID uuidGenerateV4(
Configuration configuration
) {
UuidGenerateV4 f = new UuidGenerateV4();
f.execute(configuration);
return f.getReturnValue();
}
/**
* Get <code>public.uuid_generate_v4</code> as a field.
*/
public static Field<UUID> uuidGenerateV4() {
UuidGenerateV4 f = new UuidGenerateV4();
return f.asField();
}
/**
* Call <code>public.uuid_generate_v5</code>
*/
public static UUID uuidGenerateV5(
Configuration configuration
, UUID namespace
, String name
) {
UuidGenerateV5 f = new UuidGenerateV5();
f.setNamespace(namespace);
f.setName_(name);
f.execute(configuration);
return f.getReturnValue();
}
/**
* Get <code>public.uuid_generate_v5</code> as a field.
*/
public static Field<UUID> uuidGenerateV5(
UUID namespace
, String name
) {
UuidGenerateV5 f = new UuidGenerateV5();
f.setNamespace(namespace);
f.setName_(name);
return f.asField();
}
/**
* Get <code>public.uuid_generate_v5</code> as a field.
*/
public static Field<UUID> uuidGenerateV5(
Field<UUID> namespace
, Field<String> name
) {
UuidGenerateV5 f = new UuidGenerateV5();
f.setNamespace(namespace);
f.setName_(name);
return f.asField();
}
/**
* Call <code>public.uuid_nil</code>
*/
public static UUID uuidNil(
Configuration configuration
) {
UuidNil f = new UuidNil();
f.execute(configuration);
return f.getReturnValue();
}
/**
* Get <code>public.uuid_nil</code> as a field.
*/
public static Field<UUID> uuidNil() {
UuidNil f = new UuidNil();
return f.asField();
}
/**
* Call <code>public.uuid_ns_dns</code>
*/
public static UUID uuidNsDns(
Configuration configuration
) {
UuidNsDns f = new UuidNsDns();
f.execute(configuration);
return f.getReturnValue();
}
/**
* Get <code>public.uuid_ns_dns</code> as a field.
*/
public static Field<UUID> uuidNsDns() {
UuidNsDns f = new UuidNsDns();
return f.asField();
}
/**
* Call <code>public.uuid_ns_oid</code>
*/
public static UUID uuidNsOid(
Configuration configuration
) {
UuidNsOid f = new UuidNsOid();
f.execute(configuration);
return f.getReturnValue();
}
/**
* Get <code>public.uuid_ns_oid</code> as a field.
*/
public static Field<UUID> uuidNsOid() {
UuidNsOid f = new UuidNsOid();
return f.asField();
}
/**
* Call <code>public.uuid_ns_url</code>
*/
public static UUID uuidNsUrl(
Configuration configuration
) {
UuidNsUrl f = new UuidNsUrl();
f.execute(configuration);
return f.getReturnValue();
}
/**
* Get <code>public.uuid_ns_url</code> as a field.
*/
public static Field<UUID> uuidNsUrl() {
UuidNsUrl f = new UuidNsUrl();
return f.asField();
}
/**
* Call <code>public.uuid_ns_x500</code>
*/
public static UUID uuidNsX500(
Configuration configuration
) {
UuidNsX500 f = new UuidNsX500();
f.execute(configuration);
return f.getReturnValue();
}
/**
* Get <code>public.uuid_ns_x500</code> as a field.
*/
public static Field<UUID> uuidNsX500() {
UuidNsX500 f = new UuidNsX500();
return f.asField();
}
}

12
backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/Tables.java
View file

@ -4,7 +4,9 @@
package ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.Files;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.InteractionLog;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.OkopfRecords;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.OrgOkved;
@ -14,11 +16,21 @@ import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.OrgOkved;
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Tables {
/**
* The table <code>public.files</code>.
*/
public static final Files FILES = Files.FILES;
/**
* The table <code>public.interaction_log</code>.
*/
public static final InteractionLog INTERACTION_LOG = InteractionLog.INTERACTION_LOG;
/**
* The table <code>public.okopf_records</code>.
*/
public static final OkopfRecords OKOPF_RECORDS = OkopfRecords.OKOPF_RECORDS;
/**
* The table <code>public.org_okved</code>.
*/

38
backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/routines/UuidGenerateV1.java Normal file
View file

@ -0,0 +1,38 @@
/*
* This file is generated by jOOQ.
*/
package ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.routines;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.Public;
import java.util.UUID;
import org.jooq.Parameter;
import org.jooq.impl.AbstractRoutine;
import org.jooq.impl.Internal;
import org.jooq.impl.SQLDataType;
/**
* This class is generated by jOOQ.
*/
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class UuidGenerateV1 extends AbstractRoutine<UUID> {
private static final long serialVersionUID = 1L;
/**
* The parameter <code>public.uuid_generate_v1.RETURN_VALUE</code>.
*/
public static final Parameter<UUID> RETURN_VALUE = Internal.createParameter("RETURN_VALUE", SQLDataType.UUID, false, false);
/**
* Create a new routine call instance
*/
public UuidGenerateV1() {
super("uuid_generate_v1", Public.PUBLIC, SQLDataType.UUID);
setReturnParameter(RETURN_VALUE);
}
}

38
backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/routines/UuidGenerateV1mc.java Normal file
View file

@ -0,0 +1,38 @@
/*
* This file is generated by jOOQ.
*/
package ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.routines;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.Public;
import java.util.UUID;
import org.jooq.Parameter;
import org.jooq.impl.AbstractRoutine;
import org.jooq.impl.Internal;
import org.jooq.impl.SQLDataType;
/**
* This class is generated by jOOQ.
*/
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class UuidGenerateV1mc extends AbstractRoutine<UUID> {
private static final long serialVersionUID = 1L;
/**
* The parameter <code>public.uuid_generate_v1mc.RETURN_VALUE</code>.
*/
public static final Parameter<UUID> RETURN_VALUE = Internal.createParameter("RETURN_VALUE", SQLDataType.UUID, false, false);
/**
* Create a new routine call instance
*/
public UuidGenerateV1mc() {
super("uuid_generate_v1mc", Public.PUBLIC, SQLDataType.UUID);
setReturnParameter(RETURN_VALUE);
}
}

81
backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/routines/UuidGenerateV3.java Normal file
View file

@ -0,0 +1,81 @@
/*
* This file is generated by jOOQ.
*/
package ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.routines;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.Public;
import java.util.UUID;
import org.jooq.Field;
import org.jooq.Parameter;
import org.jooq.impl.AbstractRoutine;
import org.jooq.impl.Internal;
import org.jooq.impl.SQLDataType;
/**
* This class is generated by jOOQ.
*/
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class UuidGenerateV3 extends AbstractRoutine<UUID> {
private static final long serialVersionUID = 1L;
/**
* The parameter <code>public.uuid_generate_v3.RETURN_VALUE</code>.
*/
public static final Parameter<UUID> RETURN_VALUE = Internal.createParameter("RETURN_VALUE", SQLDataType.UUID, false, false);
/**
* The parameter <code>public.uuid_generate_v3.namespace</code>.
*/
public static final Parameter<UUID> NAMESPACE = Internal.createParameter("namespace", SQLDataType.UUID, false, false);
/**
* The parameter <code>public.uuid_generate_v3.name</code>.
*/
public static final Parameter<String> NAME = Internal.createParameter("name", SQLDataType.CLOB, false, false);
/**
* Create a new routine call instance
*/
public UuidGenerateV3() {
super("uuid_generate_v3", Public.PUBLIC, SQLDataType.UUID);
setReturnParameter(RETURN_VALUE);
addInParameter(NAMESPACE);
addInParameter(NAME);
}
/**
* Set the <code>namespace</code> parameter IN value to the routine
*/
public void setNamespace(UUID value) {
setValue(NAMESPACE, value);
}
/**
* Set the <code>namespace</code> parameter to the function to be used with
* a {@link org.jooq.Select} statement
*/
public void setNamespace(Field<UUID> field) {
setField(NAMESPACE, field);
}
/**
* Set the <code>name</code> parameter IN value to the routine
*/
public void setName_(String value) {
setValue(NAME, value);
}
/**
* Set the <code>name</code> parameter to the function to be used with a
* {@link org.jooq.Select} statement
*/
public void setName_(Field<String> field) {
setField(NAME, field);
}
}

38
backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/routines/UuidGenerateV4.java Normal file
View file

@ -0,0 +1,38 @@
/*
* This file is generated by jOOQ.
*/
package ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.routines;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.Public;
import java.util.UUID;
import org.jooq.Parameter;
import org.jooq.impl.AbstractRoutine;
import org.jooq.impl.Internal;
import org.jooq.impl.SQLDataType;
/**
* This class is generated by jOOQ.
*/
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class UuidGenerateV4 extends AbstractRoutine<UUID> {
private static final long serialVersionUID = 1L;
/**
* The parameter <code>public.uuid_generate_v4.RETURN_VALUE</code>.
*/
public static final Parameter<UUID> RETURN_VALUE = Internal.createParameter("RETURN_VALUE", SQLDataType.UUID, false, false);
/**
* Create a new routine call instance
*/
public UuidGenerateV4() {
super("uuid_generate_v4", Public.PUBLIC, SQLDataType.UUID);
setReturnParameter(RETURN_VALUE);
}
}

81
backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/routines/UuidGenerateV5.java Normal file
View file

@ -0,0 +1,81 @@
/*
* This file is generated by jOOQ.
*/
package ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.routines;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.Public;
import java.util.UUID;
import org.jooq.Field;
import org.jooq.Parameter;
import org.jooq.impl.AbstractRoutine;
import org.jooq.impl.Internal;
import org.jooq.impl.SQLDataType;
/**
* This class is generated by jOOQ.
*/
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class UuidGenerateV5 extends AbstractRoutine<UUID> {
private static final long serialVersionUID = 1L;
/**
* The parameter <code>public.uuid_generate_v5.RETURN_VALUE</code>.
*/
public static final Parameter<UUID> RETURN_VALUE = Internal.createParameter("RETURN_VALUE", SQLDataType.UUID, false, false);
/**
* The parameter <code>public.uuid_generate_v5.namespace</code>.
*/
public static final Parameter<UUID> NAMESPACE = Internal.createParameter("namespace", SQLDataType.UUID, false, false);
/**
* The parameter <code>public.uuid_generate_v5.name</code>.
*/
public static final Parameter<String> NAME = Internal.createParameter("name", SQLDataType.CLOB, false, false);
/**
* Create a new routine call instance
*/
public UuidGenerateV5() {
super("uuid_generate_v5", Public.PUBLIC, SQLDataType.UUID);
setReturnParameter(RETURN_VALUE);
addInParameter(NAMESPACE);
addInParameter(NAME);
}
/**
* Set the <code>namespace</code> parameter IN value to the routine
*/
public void setNamespace(UUID value) {
setValue(NAMESPACE, value);
}
/**
* Set the <code>namespace</code> parameter to the function to be used with
* a {@link org.jooq.Select} statement
*/
public void setNamespace(Field<UUID> field) {
setField(NAMESPACE, field);
}
/**
* Set the <code>name</code> parameter IN value to the routine
*/
public void setName_(String value) {
setValue(NAME, value);
}
/**
* Set the <code>name</code> parameter to the function to be used with a
* {@link org.jooq.Select} statement
*/
public void setName_(Field<String> field) {
setField(NAME, field);
}
}

38
backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/routines/UuidNil.java Normal file
View file

@ -0,0 +1,38 @@
/*
* This file is generated by jOOQ.
*/
package ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.routines;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.Public;
import java.util.UUID;
import org.jooq.Parameter;
import org.jooq.impl.AbstractRoutine;
import org.jooq.impl.Internal;
import org.jooq.impl.SQLDataType;
/**
* This class is generated by jOOQ.
*/
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class UuidNil extends AbstractRoutine<UUID> {
private static final long serialVersionUID = 1L;
/**
* The parameter <code>public.uuid_nil.RETURN_VALUE</code>.
*/
public static final Parameter<UUID> RETURN_VALUE = Internal.createParameter("RETURN_VALUE", SQLDataType.UUID, false, false);
/**
* Create a new routine call instance
*/
public UuidNil() {
super("uuid_nil", Public.PUBLIC, SQLDataType.UUID);
setReturnParameter(RETURN_VALUE);
}
}

38
backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/routines/UuidNsDns.java Normal file
View file

@ -0,0 +1,38 @@
/*
* This file is generated by jOOQ.
*/
package ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.routines;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.Public;
import java.util.UUID;
import org.jooq.Parameter;
import org.jooq.impl.AbstractRoutine;
import org.jooq.impl.Internal;
import org.jooq.impl.SQLDataType;
/**
* This class is generated by jOOQ.
*/
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class UuidNsDns extends AbstractRoutine<UUID> {
private static final long serialVersionUID = 1L;
/**
* The parameter <code>public.uuid_ns_dns.RETURN_VALUE</code>.
*/
public static final Parameter<UUID> RETURN_VALUE = Internal.createParameter("RETURN_VALUE", SQLDataType.UUID, false, false);
/**
* Create a new routine call instance
*/
public UuidNsDns() {
super("uuid_ns_dns", Public.PUBLIC, SQLDataType.UUID);
setReturnParameter(RETURN_VALUE);
}
}

38
backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/routines/UuidNsOid.java Normal file
View file

@ -0,0 +1,38 @@
/*
* This file is generated by jOOQ.
*/
package ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.routines;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.Public;
import java.util.UUID;
import org.jooq.Parameter;
import org.jooq.impl.AbstractRoutine;
import org.jooq.impl.Internal;
import org.jooq.impl.SQLDataType;
/**
* This class is generated by jOOQ.
*/
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class UuidNsOid extends AbstractRoutine<UUID> {
private static final long serialVersionUID = 1L;
/**
* The parameter <code>public.uuid_ns_oid.RETURN_VALUE</code>.
*/
public static final Parameter<UUID> RETURN_VALUE = Internal.createParameter("RETURN_VALUE", SQLDataType.UUID, false, false);
/**
* Create a new routine call instance
*/
public UuidNsOid() {
super("uuid_ns_oid", Public.PUBLIC, SQLDataType.UUID);
setReturnParameter(RETURN_VALUE);
}
}

38
backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/routines/UuidNsUrl.java Normal file
View file

@ -0,0 +1,38 @@
/*
* This file is generated by jOOQ.
*/
package ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.routines;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.Public;
import java.util.UUID;
import org.jooq.Parameter;
import org.jooq.impl.AbstractRoutine;
import org.jooq.impl.Internal;
import org.jooq.impl.SQLDataType;
/**
* This class is generated by jOOQ.
*/
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class UuidNsUrl extends AbstractRoutine<UUID> {
private static final long serialVersionUID = 1L;
/**
* The parameter <code>public.uuid_ns_url.RETURN_VALUE</code>.
*/
public static final Parameter<UUID> RETURN_VALUE = Internal.createParameter("RETURN_VALUE", SQLDataType.UUID, false, false);
/**
* Create a new routine call instance
*/
public UuidNsUrl() {
super("uuid_ns_url", Public.PUBLIC, SQLDataType.UUID);
setReturnParameter(RETURN_VALUE);
}
}

38
backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/routines/UuidNsX500.java Normal file
View file

@ -0,0 +1,38 @@
/*
* This file is generated by jOOQ.
*/
package ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.routines;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.Public;
import java.util.UUID;
import org.jooq.Parameter;
import org.jooq.impl.AbstractRoutine;
import org.jooq.impl.Internal;
import org.jooq.impl.SQLDataType;
/**
* This class is generated by jOOQ.
*/
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class UuidNsX500 extends AbstractRoutine<UUID> {
private static final long serialVersionUID = 1L;
/**
* The parameter <code>public.uuid_ns_x500.RETURN_VALUE</code>.
*/
public static final Parameter<UUID> RETURN_VALUE = Internal.createParameter("RETURN_VALUE", SQLDataType.UUID, false, false);
/**
* Create a new routine call instance
*/
public UuidNsX500() {
super("uuid_ns_x500", Public.PUBLIC, SQLDataType.UUID);
setReturnParameter(RETURN_VALUE);
}
}

239
backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/tables/Files.java Normal file
View file

@ -0,0 +1,239 @@
/*
* This file is generated by jOOQ.
*/
package ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.Keys;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.Public;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.records.FilesRecord;
import java.util.Collection;
import org.jooq.Condition;
import org.jooq.Field;
import org.jooq.Identity;
import org.jooq.Name;
import org.jooq.PlainSQL;
import org.jooq.QueryPart;
import org.jooq.SQL;
import org.jooq.Schema;
import org.jooq.Select;
import org.jooq.Stringly;
import org.jooq.Table;
import org.jooq.TableField;
import org.jooq.TableOptions;
import org.jooq.UniqueKey;
import org.jooq.impl.DSL;
import org.jooq.impl.SQLDataType;
import org.jooq.impl.TableImpl;
/**
* This class is generated by jOOQ.
*/
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Files extends TableImpl<FilesRecord> {
private static final long serialVersionUID = 1L;
/**
* The reference instance of <code>public.files</code>
*/
public static final Files FILES = new Files();
/**
* The class holding records for this type
*/
@Override
public Class<FilesRecord> getRecordType() {
return FilesRecord.class;
}
/**
* The column <code>public.files.file_id</code>.
*/
public final TableField<FilesRecord, Long> FILE_ID = createField(DSL.name("file_id"), SQLDataType.BIGINT.nullable(false).identity(true), this, "");
/**
* The column <code>public.files.file</code>.
*/
public final TableField<FilesRecord, byte[]> FILE = createField(DSL.name("file"), SQLDataType.BLOB, this, "");
/**
* The column <code>public.files.file_name</code>.
*/
public final TableField<FilesRecord, String> FILE_NAME = createField(DSL.name("file_name"), SQLDataType.VARCHAR(10000), this, "");
/**
* The column <code>public.files.interaction_log_id</code>.
*/
public final TableField<FilesRecord, Long> INTERACTION_LOG_ID = createField(DSL.name("interaction_log_id"), SQLDataType.BIGINT, this, "");
private Files(Name alias, Table<FilesRecord> aliased) {
this(alias, aliased, (Field<?>[]) null, null);
}
private Files(Name alias, Table<FilesRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
}
/**
* Create an aliased <code>public.files</code> table reference
*/
public Files(String alias) {
this(DSL.name(alias), FILES);
}
/**
* Create an aliased <code>public.files</code> table reference
*/
public Files(Name alias) {
this(alias, FILES);
}
/**
* Create a <code>public.files</code> table reference
*/
public Files() {
this(DSL.name("files"), null);
}
@Override
public Schema getSchema() {
return aliased() ? null : Public.PUBLIC;
}
@Override
public Identity<FilesRecord, Long> getIdentity() {
return (Identity<FilesRecord, Long>) super.getIdentity();
}
@Override
public UniqueKey<FilesRecord> getPrimaryKey() {
return Keys.FILES_PKEY;
}
@Override
public Files as(String alias) {
return new Files(DSL.name(alias), this);
}
@Override
public Files as(Name alias) {
return new Files(alias, this);
}
@Override
public Files as(Table<?> alias) {
return new Files(alias.getQualifiedName(), this);
}
/**
* Rename this table
*/
@Override
public Files rename(String name) {
return new Files(DSL.name(name), null);
}
/**
* Rename this table
*/
@Override
public Files rename(Name name) {
return new Files(name, null);
}
/**
* Rename this table
*/
@Override
public Files rename(Table<?> name) {
return new Files(name.getQualifiedName(), null);
}
/**
* Create an inline derived table from this table
*/
@Override
public Files where(Condition condition) {
return new Files(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**
* Create an inline derived table from this table
*/
@Override
public Files where(Collection<? extends Condition> conditions) {
return where(DSL.and(conditions));
}
/**
* Create an inline derived table from this table
*/
@Override
public Files where(Condition... conditions) {
return where(DSL.and(conditions));
}
/**
* Create an inline derived table from this table
*/
@Override
public Files where(Field<Boolean> condition) {
return where(DSL.condition(condition));
}
/**
* Create an inline derived table from this table
*/
@Override
@PlainSQL
public Files where(SQL condition) {
return where(DSL.condition(condition));
}
/**
* Create an inline derived table from this table
*/
@Override
@PlainSQL
public Files where(@Stringly.SQL String condition) {
return where(DSL.condition(condition));
}
/**
* Create an inline derived table from this table
*/
@Override
@PlainSQL
public Files where(@Stringly.SQL String condition, Object... binds) {
return where(DSL.condition(condition, binds));
}
/**
* Create an inline derived table from this table
*/
@Override
@PlainSQL
public Files where(@Stringly.SQL String condition, QueryPart... parts) {
return where(DSL.condition(condition, parts));
}
/**
* Create an inline derived table from this table
*/
@Override
public Files whereExists(Select<?> select) {
return where(DSL.exists(select));
}
/**
* Create an inline derived table from this table
*/
@Override
public Files whereNotExists(Select<?> select) {
return where(DSL.notExists(select));
}
}

20
backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/tables/InteractionLog.java
View file

@ -61,11 +61,6 @@ public class InteractionLog extends TableImpl<InteractionLogRecord> {
*/
public final TableField<InteractionLogRecord, Timestamp> SENT_DATE = createField(DSL.name("sent_date"), SQLDataType.TIMESTAMP(0), this, "");
/**
* The column <code>public.interaction_log.file_name</code>.
*/
public final TableField<InteractionLogRecord, String> FILE_NAME = createField(DSL.name("file_name"), SQLDataType.CLOB, this, "");
/**
* The column <code>public.interaction_log.form</code>.
*/
@ -91,6 +86,21 @@ public class InteractionLog extends TableImpl<InteractionLogRecord> {
*/
public final TableField<InteractionLogRecord, Integer> RECORDS_ACCEPTED = createField(DSL.name("records_accepted"), SQLDataType.INTEGER, this, "");
/**
* The column <code>public.interaction_log.file_name</code>.
*/
public final TableField<InteractionLogRecord, String> FILE_NAME = createField(DSL.name("file_name"), SQLDataType.CLOB, this, "");
/**
* The column <code>public.interaction_log.file_id</code>.
*/
public final TableField<InteractionLogRecord, String> FILE_ID = createField(DSL.name("file_id"), SQLDataType.VARCHAR(36), this, "");
/**
* The column <code>public.interaction_log.ervu_id</code>.
*/
public final TableField<InteractionLogRecord, String> ERVU_ID = createField(DSL.name("ervu_id"), SQLDataType.VARCHAR(36), this, "");
private InteractionLog(Name alias, Table<InteractionLogRecord> aliased) {
this(alias, aliased, (Field<?>[]) null, null);
}

235
backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/tables/OkopfRecords.java Normal file
View file

@ -0,0 +1,235 @@
/*
* This file is generated by jOOQ.
*/
package ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.Keys;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.Public;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.records.OkopfRecordsRecord;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import org.jooq.Condition;
import org.jooq.Field;
import org.jooq.Name;
import org.jooq.PlainSQL;
import org.jooq.QueryPart;
import org.jooq.SQL;
import org.jooq.Schema;
import org.jooq.Select;
import org.jooq.Stringly;
import org.jooq.Table;
import org.jooq.TableField;
import org.jooq.TableOptions;
import org.jooq.UniqueKey;
import org.jooq.impl.DSL;
import org.jooq.impl.SQLDataType;
import org.jooq.impl.TableImpl;
/**
* This class is generated by jOOQ.
*/
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class OkopfRecords extends TableImpl<OkopfRecordsRecord> {
private static final long serialVersionUID = 1L;
/**
* The reference instance of <code>public.okopf_records</code>
*/
public static final OkopfRecords OKOPF_RECORDS = new OkopfRecords();
/**
* The class holding records for this type
*/
@Override
public Class<OkopfRecordsRecord> getRecordType() {
return OkopfRecordsRecord.class;
}
/**
* The column <code>public.okopf_records.okopf_records_id</code>.
*/
public final TableField<OkopfRecordsRecord, String> OKOPF_RECORDS_ID = createField(DSL.name("okopf_records_id"), SQLDataType.VARCHAR.nullable(false), this, "");
/**
* The column <code>public.okopf_records.name</code>.
*/
public final TableField<OkopfRecordsRecord, String> NAME = createField(DSL.name("name"), SQLDataType.VARCHAR, this, "");
/**
* The column <code>public.okopf_records.version</code>.
*/
public final TableField<OkopfRecordsRecord, Integer> VERSION = createField(DSL.name("version"), SQLDataType.INTEGER.nullable(false), this, "");
private OkopfRecords(Name alias, Table<OkopfRecordsRecord> aliased) {
this(alias, aliased, (Field<?>[]) null, null);
}
private OkopfRecords(Name alias, Table<OkopfRecordsRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
}
/**
* Create an aliased <code>public.okopf_records</code> table reference
*/
public OkopfRecords(String alias) {
this(DSL.name(alias), OKOPF_RECORDS);
}
/**
* Create an aliased <code>public.okopf_records</code> table reference
*/
public OkopfRecords(Name alias) {
this(alias, OKOPF_RECORDS);
}
/**
* Create a <code>public.okopf_records</code> table reference
*/
public OkopfRecords() {
this(DSL.name("okopf_records"), null);
}
@Override
public Schema getSchema() {
return aliased() ? null : Public.PUBLIC;
}
@Override
public UniqueKey<OkopfRecordsRecord> getPrimaryKey() {
return Keys.OKOPF_RECORDS_PKEY;
}
@Override
public List<UniqueKey<OkopfRecordsRecord>> getUniqueKeys() {
return Arrays.asList(Keys.OKOPF_RECORDS_NAME_KEY);
}
@Override
public OkopfRecords as(String alias) {
return new OkopfRecords(DSL.name(alias), this);
}
@Override
public OkopfRecords as(Name alias) {
return new OkopfRecords(alias, this);
}
@Override
public OkopfRecords as(Table<?> alias) {
return new OkopfRecords(alias.getQualifiedName(), this);
}
/**
* Rename this table
*/
@Override
public OkopfRecords rename(String name) {
return new OkopfRecords(DSL.name(name), null);
}
/**
* Rename this table
*/
@Override
public OkopfRecords rename(Name name) {
return new OkopfRecords(name, null);
}
/**
* Rename this table
*/
@Override
public OkopfRecords rename(Table<?> name) {
return new OkopfRecords(name.getQualifiedName(), null);
}
/**
* Create an inline derived table from this table
*/
@Override
public OkopfRecords where(Condition condition) {
return new OkopfRecords(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**
* Create an inline derived table from this table
*/
@Override
public OkopfRecords where(Collection<? extends Condition> conditions) {
return where(DSL.and(conditions));
}
/**
* Create an inline derived table from this table
*/
@Override
public OkopfRecords where(Condition... conditions) {
return where(DSL.and(conditions));
}
/**
* Create an inline derived table from this table
*/
@Override
public OkopfRecords where(Field<Boolean> condition) {
return where(DSL.condition(condition));
}
/**
* Create an inline derived table from this table
*/
@Override
@PlainSQL
public OkopfRecords where(SQL condition) {
return where(DSL.condition(condition));
}
/**
* Create an inline derived table from this table
*/
@Override
@PlainSQL
public OkopfRecords where(@Stringly.SQL String condition) {
return where(DSL.condition(condition));
}
/**
* Create an inline derived table from this table
*/
@Override
@PlainSQL
public OkopfRecords where(@Stringly.SQL String condition, Object... binds) {
return where(DSL.condition(condition, binds));
}
/**
* Create an inline derived table from this table
*/
@Override
@PlainSQL
public OkopfRecords where(@Stringly.SQL String condition, QueryPart... parts) {
return where(DSL.condition(condition, parts));
}
/**
* Create an inline derived table from this table
*/
@Override
public OkopfRecords whereExists(Select<?> select) {
return where(DSL.exists(select));
}
/**
* Create an inline derived table from this table
*/
@Override
public OkopfRecords whereNotExists(Select<?> select) {
return where(DSL.notExists(select));
}
}

109
backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/tables/records/FilesRecord.java Normal file
View file

@ -0,0 +1,109 @@
/*
* This file is generated by jOOQ.
*/
package ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.records;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.Files;
import org.jooq.Record1;
import org.jooq.impl.UpdatableRecordImpl;
/**
* This class is generated by jOOQ.
*/
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class FilesRecord extends UpdatableRecordImpl<FilesRecord> {
private static final long serialVersionUID = 1L;
/**
* Setter for <code>public.files.file_id</code>.
*/
public void setFileId(Long value) {
set(0, value);
}
/**
* Getter for <code>public.files.file_id</code>.
*/
public Long getFileId() {
return (Long) get(0);
}
/**
* Setter for <code>public.files.file</code>.
*/
public void setFile(byte[] value) {
set(1, value);
}
/**
* Getter for <code>public.files.file</code>.
*/
public byte[] getFile() {
return (byte[]) get(1);
}
/**
* Setter for <code>public.files.file_name</code>.
*/
public void setFileName(String value) {
set(2, value);
}
/**
* Getter for <code>public.files.file_name</code>.
*/
public String getFileName() {
return (String) get(2);
}
/**
* Setter for <code>public.files.interaction_log_id</code>.
*/
public void setInteractionLogId(Long value) {
set(3, value);
}
/**
* Getter for <code>public.files.interaction_log_id</code>.
*/
public Long getInteractionLogId() {
return (Long) get(3);
}
// -------------------------------------------------------------------------
// Primary key information
// -------------------------------------------------------------------------
@Override
public Record1<Long> key() {
return (Record1) super.key();
}
// -------------------------------------------------------------------------
// Constructors
// -------------------------------------------------------------------------
/**
* Create a detached FilesRecord
*/
public FilesRecord() {
super(Files.FILES);
}
/**
* Create a detached, initialised FilesRecord
*/
public FilesRecord(Long fileId, byte[] file, String fileName, Long interactionLogId) {
super(Files.FILES);
setFileId(fileId);
setFile(file);
setFileName(fileName);
setInteractionLogId(interactionLogId);
resetChangedOnNotNull();
}
}

82
backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/tables/records/InteractionLogRecord.java
View file

@ -48,88 +48,116 @@ public class InteractionLogRecord extends UpdatableRecordImpl<InteractionLogReco
return (Timestamp) get(1);
}
/**
* Setter for <code>public.interaction_log.file_name</code>.
*/
public void setFileName(String value) {
set(2, value);
}
/**
* Getter for <code>public.interaction_log.file_name</code>.
*/
public String getFileName() {
return (String) get(2);
}
/**
* Setter for <code>public.interaction_log.form</code>.
*/
public void setForm(String value) {
set(3, value);
set(2, value);
}
/**
* Getter for <code>public.interaction_log.form</code>.
*/
public String getForm() {
return (String) get(3);
return (String) get(2);
}
/**
* Setter for <code>public.interaction_log.sender</code>.
*/
public void setSender(String value) {
set(4, value);
set(3, value);
}
/**
* Getter for <code>public.interaction_log.sender</code>.
*/
public String getSender() {
return (String) get(4);
return (String) get(3);
}
/**
* Setter for <code>public.interaction_log.status</code>.
*/
public void setStatus(String value) {
set(5, value);
set(4, value);
}
/**
* Getter for <code>public.interaction_log.status</code>.
*/
public String getStatus() {
return (String) get(5);
return (String) get(4);
}
/**
* Setter for <code>public.interaction_log.records_sent</code>.
*/
public void setRecordsSent(Integer value) {
set(6, value);
set(5, value);
}
/**
* Getter for <code>public.interaction_log.records_sent</code>.
*/
public Integer getRecordsSent() {
return (Integer) get(6);
return (Integer) get(5);
}
/**
* Setter for <code>public.interaction_log.records_accepted</code>.
*/
public void setRecordsAccepted(Integer value) {
set(7, value);
set(6, value);
}
/**
* Getter for <code>public.interaction_log.records_accepted</code>.
*/
public Integer getRecordsAccepted() {
return (Integer) get(7);
return (Integer) get(6);
}
/**
* Setter for <code>public.interaction_log.file_name</code>.
*/
public void setFileName(String value) {
set(7, value);
}
/**
* Getter for <code>public.interaction_log.file_name</code>.
*/
public String getFileName() {
return (String) get(7);
}
/**
* Setter for <code>public.interaction_log.file_id</code>.
*/
public void setFileId(String value) {
set(8, value);
}
/**
* Getter for <code>public.interaction_log.file_id</code>.
*/
public String getFileId() {
return (String) get(8);
}
/**
* Setter for <code>public.interaction_log.ervu_id</code>.
*/
public void setErvuId(String value) {
set(9, value);
}
/**
* Getter for <code>public.interaction_log.ervu_id</code>.
*/
public String getErvuId() {
return (String) get(9);
}
// -------------------------------------------------------------------------
@ -155,17 +183,19 @@ public class InteractionLogRecord extends UpdatableRecordImpl<InteractionLogReco
/**
* Create a detached, initialised InteractionLogRecord
*/
public InteractionLogRecord(Long id, Timestamp sentDate, String fileName, String form, String sender, String status, Integer recordsSent, Integer recordsAccepted) {
public InteractionLogRecord(Long id, Timestamp sentDate, String form, String sender, String status, Integer recordsSent, Integer recordsAccepted, String fileName, String fileId, String ervuId) {
super(InteractionLog.INTERACTION_LOG);
setId(id);
setSentDate(sentDate);
setFileName(fileName);
setForm(form);
setSender(sender);
setStatus(status);
setRecordsSent(recordsSent);
setRecordsAccepted(recordsAccepted);
setFileName(fileName);
setFileId(fileId);
setErvuId(ervuId);
resetChangedOnNotNull();
}
}

94
backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/tables/records/OkopfRecordsRecord.java Normal file
View file

@ -0,0 +1,94 @@
/*
* This file is generated by jOOQ.
*/
package ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.records;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.OkopfRecords;
import org.jooq.Record1;
import org.jooq.impl.UpdatableRecordImpl;
/**
* This class is generated by jOOQ.
*/
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class OkopfRecordsRecord extends UpdatableRecordImpl<OkopfRecordsRecord> {
private static final long serialVersionUID = 1L;
/**
* Setter for <code>public.okopf_records.okopf_records_id</code>.
*/
public void setOkopfRecordsId(String value) {
set(0, value);
}
/**
* Getter for <code>public.okopf_records.okopf_records_id</code>.
*/
public String getOkopfRecordsId() {
return (String) get(0);
}
/**
* Setter for <code>public.okopf_records.name</code>.
*/
public void setName(String value) {
set(1, value);
}
/**
* Getter for <code>public.okopf_records.name</code>.
*/
public String getName() {
return (String) get(1);
}
/**
* Setter for <code>public.okopf_records.version</code>.
*/
public void setVersion(Integer value) {
set(2, value);
}
/**
* Getter for <code>public.okopf_records.version</code>.
*/
public Integer getVersion() {
return (Integer) get(2);
}
// -------------------------------------------------------------------------
// Primary key information
// -------------------------------------------------------------------------
@Override
public Record1<String> key() {
return (Record1) super.key();
}
// -------------------------------------------------------------------------
// Constructors
// -------------------------------------------------------------------------
/**
* Create a detached OkopfRecordsRecord
*/
public OkopfRecordsRecord() {
super(OkopfRecords.OKOPF_RECORDS);
}
/**
* Create a detached, initialised OkopfRecordsRecord
*/
public OkopfRecordsRecord(String okopfRecordsId, String name, Integer version) {
super(OkopfRecords.OKOPF_RECORDS);
setOkopfRecordsId(okopfRecordsId);
setName(name);
setVersion(version);
resetChangedOnNotNull();
}
}

21
backend/src/main/java/ru/micord/ervu/kafka/ReplyingKafkaConfig.java
View file

@ -1,11 +1,13 @@
package ru.micord.ervu.kafka;
import org.apache.kafka.clients.CommonClientConfigs;
import java.time.Duration;
import java.util.HashMap;
import java.util.Map;
import org.apache.kafka.clients.consumer.ConsumerConfig;
import org.apache.kafka.clients.producer.ProducerConfig;
import org.apache.kafka.common.config.SaslConfigs;
import org.apache.kafka.common.serialization.StringDeserializer;
import org.apache.kafka.common.serialization.StringSerializer;
import org.springframework.beans.factory.annotation.Qualifier;
@ -41,12 +43,27 @@ public class ReplyingKafkaConfig {
@Value("${ervu-kafka.reply-timeout:30}")
private long replyTimeout;
@Value("${ervu-kafka.send.security.protocol}")
private String securityProtocol;
@Value("${ervu-kafka.send.login.module:org.apache.kafka.common.security.scram.ScramLoginModule}")
private String loginModule;
@Value("${ervu-kafka.send.username}")
private String username;
@Value("${ervu-kafka.send.password}")
private String password;
@Value("${ervu-kafka.sasl.mechanism}")
private String saslMechanism;
@Bean
public ProducerFactory<String, String> producerFactory() {
Map<String, Object> configProps = new HashMap<>();
configProps.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServers);
configProps.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class);
configProps.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, StringSerializer.class);
configProps.put(CommonClientConfigs.SECURITY_PROTOCOL_CONFIG, securityProtocol);
configProps.put(SaslConfigs.SASL_JAAS_CONFIG, loginModule + " required username=\""
+ username + "\" password=\"" + password + "\";");
configProps.put(SaslConfigs.SASL_MECHANISM, saslMechanism);
return new DefaultKafkaProducerFactory<>(configProps);
}
@ -62,6 +79,10 @@ public class ReplyingKafkaConfig {
configProps.put(ConsumerConfig.GROUP_ID_CONFIG, groupId);
configProps.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class);
configProps.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class);
configProps.put(CommonClientConfigs.SECURITY_PROTOCOL_CONFIG, securityProtocol);
configProps.put(SaslConfigs.SASL_JAAS_CONFIG, loginModule + " required username=\""
+ username + "\" password=\"" + password + "\";");
configProps.put(SaslConfigs.SASL_MECHANISM, saslMechanism);
return new DefaultKafkaConsumerFactory<>(configProps);
}

11
backend/src/main/java/ru/micord/ervu/service/StatusService.java Normal file
View file

@ -0,0 +1,11 @@
package ru.micord.ervu.service;
import java.sql.Timestamp;
/**
* @author Eduard Tihomirov
*/
public interface StatusService {
void setStatus(String fileId, String status, String fileName, String form, Timestamp timestamp, String sender, Integer count, String ervuId);
}

32
backend/src/main/java/ru/micord/ervu/service/StatusServiceImpl.java Normal file
View file

@ -0,0 +1,32 @@
package ru.micord.ervu.service;
import java.sql.Timestamp;
import org.jooq.DSLContext;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import static ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.InteractionLog.INTERACTION_LOG;
/**
* @author Eduard Tihomirov
*/
@Service
public class StatusServiceImpl implements StatusService {
@Autowired
private DSLContext dslContext;
public void setStatus(String fileId, String status, String fileName, String form, Timestamp timestamp, String sender,
Integer count, String ervuId) {
dslContext.insertInto(INTERACTION_LOG)
.set(INTERACTION_LOG.FILE_ID, fileId)
.set(INTERACTION_LOG.STATUS, status)
.set(INTERACTION_LOG.FORM, form)
.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.ERVU_ID, ervuId);
}
}

20
backend/src/main/resources/config/v_1.0/2024-09-11--01-add-new-column-interaction-log.xml Normal file
View file

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<databaseChangeLog
xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd">
<changeSet id="001" author="tihomirov">
<comment>add file id column into interaction_log table</comment>
<addColumn schemaName="public" tableName="interaction_log">
<column name="file_id" type="varchar(36)"/>
</addColumn>
</changeSet>
<changeSet id="002" author="tihomirov">
<comment>add ervu id column into interaction_log table</comment>
<addColumn schemaName="public" tableName="interaction_log">
<column name="ervu_id" type="varchar(36)"/>
</addColumn>
</changeSet>
</databaseChangeLog>

1
backend/src/main/resources/config/v_1.0/changelog-v_1.0.xml
View file

@ -6,5 +6,6 @@
http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd">
<include file="2024-29-08--01-create-table-record-attributes.xml" relativeToChangelogFile="true"/>
<include file="2024-09-11--01-add-new-column-interaction-log.xml" relativeToChangelogFile="true"/>
</databaseChangeLog>

1
config/asd Normal file
View file

@ -0,0 +1 @@
org_fullname, org_shortname, org_brhs, org_brhs_ctts, org_brhs_addrs, org_type, org_ogrn, org_inn, org_leg, org_kpp, org_ctts, org_addrs, org_grps, org_emps

12
config/patches/default.cli
View file

@ -31,12 +31,12 @@ xa-data-source add \
/system-property=file.webdav.upload.url:add(value="https://ervu-webdav.k8s.micord.ru")
/system-property=file.webdav.upload.username:add(value="test")
/system-property=file.webdav.upload.password:add(value="test")
/system-property=kafka.send.message.topic.name:add(value="file-upload-v2")
/system-property=kafka.send.url:add(value="http://10.10.31.11:32609")
/system-property=kafka.send.security.protocol:add(value="SASL_PLAINTEXT")
/system-property=kafka.sasl.mechanism:add(value="SCRAM-SHA-256")
/system-property=kafka.send.username:add(value="user1")
/system-property=kafka.send.password:add(value="Blfi9d2OFG")
/system-property=av-kafka.send.message.topic.name:add(value="ervu.lkrp.download.request")
/system-property=av-kafka.send.url:add(value="http://10.10.31.11:32609")
/system-property=av-kafka.send.security.protocol:add(value="SASL_PLAINTEXT")
/system-property=av-kafka.sasl.mechanism:add(value="SCRAM-SHA-256")
/system-property=av-kafka.send.username:add(value="user1")
/system-property=av-kafka.send.password:add(value="Blfi9d2OFG")
/system-property=ervu.fileupload.max_file_size:add(value="5242880")
/system-property=ervu.fileupload.max_request_size:add(value="6291456")
/system-property=ervu.fileupload.file_size_threshold:add(value="0")

12
config/standalone/dev/standalone.xml
View file

@ -57,12 +57,12 @@
<property name="file.webdav.upload.url" value="https://ervu-webdav.k8s.micord.ru"/>
<property name="file.webdav.upload.username" value="test"/>
<property name="file.webdav.upload.password" value="test"/>
<property name="kafka.send.message.topic.name" value="file-upload-v2"/>
<property name="kafka.send.url" value="http://10.10.31.11:32609"/>
<property name="kafka.send.security.protocol" value="SASL_PLAINTEXT"/>
<property name="kafka.sasl.mechanism" value="SCRAM-SHA-256"/>
<property name="kafka.send.username" value="user1"/>
<property name="kafka.send.password" value="Blfi9d2OFG"/>
<property name="av-kafka.download-request-topic" value="ervu.lkrp.download.request"/>
<property name="av-kafka.send.url" value="localhost:9092"/>
<property name="av-kafka.send.security.protocol" value="SASL_PLAINTEXT"/>
<property name="av-kafka.sasl.mechanism" value="SCRAM-SHA-256"/>
<property name="av-kafka.send.username" value="user1"/>
<property name="av-kafka.send.password" value="Blfi9d2OFG"/>
<property name="ervu.fileupload.max_file_size" value="5242880"/>
<property name="ervu.fileupload.max_request_size" value="6291456"/>
<property name="ervu.fileupload.file_size_threshold" value="0"/>

12
config/tomcat/tomee/conf/webbpm.properties
View file

@ -18,12 +18,12 @@ webbpm.cache.hazelcast.outbound_port_definitions=5801-5820
file.webdav.upload.url=https://ervu-webdav.k8s.micord.ru
file.webdav.upload.username=test
file.webdav.upload.password=test
kafka.send.message.topic.name=file-upload-v2
kafka.send.url=http://10.10.31.11:32609
kafka.send.security.protocol=SASL_PLAINTEXT
kafka.sasl.mechanism=SCRAM-SHA-256
kafka.send.username=user1
kafka.send.password=Blfi9d2OFG
av-kafka.send.message.topic.name=file-upload-v2
av-kafka.send.url=http://10.10.31.11:32609
av-kafka.send.security.protocol=SASL_PLAINTEXT
av-kafka.sasl.mechanism=SCRAM-SHA-256
av-kafka.send.username=user1
av-kafka.send.password=Blfi9d2OFG
ervu.fileupload.max_file_size=5242880
ervu.fileupload.max_request_size=6291456
ervu.fileupload.file_size_threshold=0