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

SUPPORT-8471: complete fix

Browse source
This commit is contained in:
Хакимуллин Артём 2024-09-12 11:57:19 +03:00
parent 8a270cc563
commit b1b9a35993
11 changed files with 49 additions and 572 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backend/src/main/java/ervu/client/classified/EsnsiOkopfClient.java
View file

@ -24,7 +24,7 @@ public class EsnsiOkopfClient {
private static final Logger logger = LoggerFactory.getLogger(EsnsiOkopfClient.class); private static final Logger logger = LoggerFactory.getLogger(EsnsiOkopfClient.class);
@Value("${esnsi.okopf.url:#{null}") @Value("${esnsi.okopf.url:#{null}}")
private String uri; private String uri;
@Retryable(value = {TimeoutException.class}, backoff = @Retryable(value = {TimeoutException.class}, backoff =

67
backend/src/main/java/ervu/dao/classifier/OkopfRecordDaoImpl.java
View file

@ -1,13 +1,12 @@
package ervu.dao.classifier; package ervu.dao.classifier;
import java.util.UUID; import java.util.List;
import ervu.service.classifier.model.OkopfRecordModel; import ervu.service.classifier.model.OkopfRecordModel;
import org.jooq.DSLContext; import org.jooq.DSLContext;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import static ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.Tables.OKOPF_ATTRIBUTES;
import static ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.Tables.OKOPF_RECORDS; import static ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.Tables.OKOPF_RECORDS;
@ -21,62 +20,24 @@ public class OkopfRecordDaoImpl implements OkopfRecordDao {
private DSLContext dsl; private DSLContext dsl;
@Override @Override
public void save(OkopfRecordModel[] recordModels, String version) { public void save(List<OkopfRecordModel> recordModels, int version) {
// var queries = Arrays.stream(recordModels) var queries = recordModels.stream().map(record ->
// .flatMap(it -> Arrays.stream(it.getOkopfRecords()) dsl.insertInto(OKOPF_RECORDS, OKOPF_RECORDS.OKOPF_RECORDS_ID, OKOPF_RECORDS.NAME, OKOPF_RECORDS.VERSION)
// .map(attribute -> { .values(record.getCode(), record.getName(), version)
// var recordUid = UUID.fromString(it.getUid()); .onConflict(OKOPF_RECORDS.OKOPF_RECORDS_ID)
// var attributeUid = UUID.fromString(attribute.getAttributeUid()); .doUpdate()
// var value = attribute.getValue(); .set(OKOPF_RECORDS.NAME, record.getName())
// .set(OKOPF_RECORDS.VERSION, version)
// return dsl.insertInto(OKOPF_RECORDS, .where(OKOPF_RECORDS.OKOPF_RECORDS_ID.eq(record.getCode()))).toList();
// OKOPF_RECORDS.RECORD_ID,
// OKOPF_RECORDS.ATTRIBUTE_ID,
// OKOPF_RECORDS.VALUE,
// OKOPF_RECORDS.VERSION
// )
// .values(recordUid, attributeUid, value, version)
// .onConflict(OKOPF_RECORDS.RECORD_ID, OKOPF_RECORDS.ATTRIBUTE_ID)
// .doUpdate()
// .set(OKOPF_RECORDS.VALUE, value)
// .set(OKOPF_RECORDS.VERSION, version)
// .where(OKOPF_RECORDS.RECORD_ID.eq(recordUid)
// .and(OKOPF_RECORDS.ATTRIBUTE_ID.eq(attributeUid)));
// }))
// .toList();
//
// dsl.batch(queries).execute();
}
@Override dsl.batch(queries).execute();
public String fetchVersion() {
return dsl.select(OKOPF_RECORDS.VERSION)
.from(OKOPF_RECORDS)
.limit(1)
.fetchOptional(OKOPF_RECORDS.VERSION)
.orElse("0");
} }
@Override @Override
public String fetchTitleByLeg(String leg) { public String fetchTitleByLeg(String leg) {
return dsl.select(OKOPF_RECORDS.VALUE) return dsl.select(OKOPF_RECORDS.NAME)
.from(OKOPF_RECORDS) .from(OKOPF_RECORDS)
.join(OKOPF_ATTRIBUTES) .where(OKOPF_RECORDS.OKOPF_RECORDS_ID.eq(leg))
.on(OKOPF_RECORDS.ATTRIBUTE_ID.eq(OKOPF_ATTRIBUTES.OKOPF_ATTRIBUTE_ID)) .fetchOne(OKOPF_RECORDS.NAME);
.where(OKOPF_ATTRIBUTES.ATTRIBUTE_NAME.eq("title")
.and(OKOPF_RECORDS.RECORD_ID.eq(
dsl.select(OKOPF_RECORDS.RECORD_ID)
.from(OKOPF_RECORDS)
.where(OKOPF_RECORDS.VALUE.equal(leg))
.fetchOneInto(UUID.class)))
)
.fetchOneInto(String.class);
}
@Override
public void deleteAllByVersion(String version) {
dsl.deleteFrom(OKOPF_RECORDS)
.where(OKOPF_RECORDS.VERSION.eq(version))
.execute();
} }
} }

8
backend/src/main/java/ervu/service/scheduer/EsnsiOkopfSchedulerServiceImpl.java
View file

@ -9,6 +9,8 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import ervu.client.classified.EsnsiOkopfClient; import ervu.client.classified.EsnsiOkopfClient;
import ervu.dao.classifier.OkopfRecordDao; import ervu.dao.classifier.OkopfRecordDao;
import ervu.service.classifier.model.OkopfRecordModel; import ervu.service.classifier.model.OkopfRecordModel;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled; import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -19,6 +21,8 @@ import org.springframework.transaction.annotation.Transactional;
*/ */
@Service @Service
public class EsnsiOkopfSchedulerServiceImpl implements EsnsiOkopfSchedulerService { public class EsnsiOkopfSchedulerServiceImpl implements EsnsiOkopfSchedulerService {
private static final Logger logger = LoggerFactory.getLogger(EsnsiOkopfSchedulerServiceImpl.class);
@Autowired @Autowired
private EsnsiOkopfClient esnsiOkopfClient; private EsnsiOkopfClient esnsiOkopfClient;
@Autowired @Autowired
@ -29,6 +33,7 @@ public class EsnsiOkopfSchedulerServiceImpl implements EsnsiOkopfSchedulerServic
@Scheduled(cron = "${esnsi.okopf.cron:0 0 */1 * * *}") @Scheduled(cron = "${esnsi.okopf.cron:0 0 */1 * * *}")
@Transactional @Transactional
public void load() { public void load() {
logger.info("Starting scheduller load okopf....");
String data = esnsiOkopfClient.getJsonOkopFormData(); String data = esnsiOkopfClient.getJsonOkopFormData();
try { try {
List<OkopfRecordModel> okopfRecords = mapToOkopfRecords(data); List<OkopfRecordModel> okopfRecords = mapToOkopfRecords(data);
@ -49,9 +54,8 @@ public class EsnsiOkopfSchedulerServiceImpl implements EsnsiOkopfSchedulerServic
String name = null; String name = null;
for (JsonNode record : attributeValues) { for (JsonNode record : attributeValues) {
String value = record.get("value").asText(); String value = record.get("value").asText();
if (value.matches("\\d+")) { if (value.matches("\\d+"))
code = value; code = value;
}
else { else {
name = value; name = value;
break; break;

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

@ -6,16 +6,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.Files;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.InteractionLog; import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.InteractionLog;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.OkopfAttributes;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.OkopfRecords; 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.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.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.InteractionLogRecord;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.records.OkopfAttributesRecord;
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.OkopfRecordsRecord;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.records.OrgOkvedRecord; import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.records.OrgOkvedRecord;
import org.jooq.ForeignKey;
import org.jooq.TableField; import org.jooq.TableField;
import org.jooq.UniqueKey; import org.jooq.UniqueKey;
import org.jooq.impl.DSL; import org.jooq.impl.DSL;
@ -35,15 +32,7 @@ public class Keys {
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<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<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<OkopfAttributesRecord> OKOPF_ATTRIBUTES_ATTRIBUTE_NAME_KEY = Internal.createUniqueKey(OkopfAttributes.OKOPF_ATTRIBUTES, DSL.name("okopf_attributes_attribute_name_key"), new TableField[] { OkopfAttributes.OKOPF_ATTRIBUTES.ATTRIBUTE_NAME }, 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<OkopfAttributesRecord> OKOPF_ATTRIBUTES_PKEY = Internal.createUniqueKey(OkopfAttributes.OKOPF_ATTRIBUTES, DSL.name("okopf_attributes_pkey"), new TableField[] { OkopfAttributes.OKOPF_ATTRIBUTES.OKOPF_ATTRIBUTE_ID }, 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<OkopfRecordsRecord> OKOPF_RECORDS_PKEY = Internal.createUniqueKey(OkopfRecords.OKOPF_RECORDS, DSL.name("okopf_records_pkey"), new TableField[] { OkopfRecords.OKOPF_RECORDS.OKOPF_RECORD_ID }, true);
public static final UniqueKey<OkopfRecordsRecord> UNI_RECORD_UID_ATTRIBUTE_UID = Internal.createUniqueKey(OkopfRecords.OKOPF_RECORDS, DSL.name("uni_record_uid_attribute_uid"), new TableField[] { OkopfRecords.OKOPF_RECORDS.RECORD_ID, OkopfRecords.OKOPF_RECORDS.ATTRIBUTE_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); 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);
// -------------------------------------------------------------------------
// FOREIGN KEY definitions
// -------------------------------------------------------------------------
public static final ForeignKey<OkopfRecordsRecord, OkopfAttributesRecord> OKOPF_RECORDS__OKOPF_RECORDS_ATTRIBUTE_ID_FKEY = Internal.createForeignKey(OkopfRecords.OKOPF_RECORDS, DSL.name("okopf_records_attribute_id_fkey"), new TableField[] { OkopfRecords.OKOPF_RECORDS.ATTRIBUTE_ID }, Keys.OKOPF_ATTRIBUTES_PKEY, new TableField[] { OkopfAttributes.OKOPF_ATTRIBUTES.OKOPF_ATTRIBUTE_ID }, true);
} }

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

@ -7,7 +7,6 @@ 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.DefaultCatalog;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.Files; 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.InteractionLog;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.OkopfAttributes;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.OkopfRecords; 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.OrgOkved;
@ -42,11 +41,6 @@ public class Public extends SchemaImpl {
*/ */
public final InteractionLog INTERACTION_LOG = InteractionLog.INTERACTION_LOG; public final InteractionLog INTERACTION_LOG = InteractionLog.INTERACTION_LOG;
/**
* The table <code>public.okopf_attributes</code>.
*/
public final OkopfAttributes OKOPF_ATTRIBUTES = OkopfAttributes.OKOPF_ATTRIBUTES;
/** /**
* The table <code>public.okopf_records</code>. * The table <code>public.okopf_records</code>.
*/ */
@ -75,7 +69,6 @@ public class Public extends SchemaImpl {
return Arrays.asList( return Arrays.asList(
Files.FILES, Files.FILES,
InteractionLog.INTERACTION_LOG, InteractionLog.INTERACTION_LOG,
OkopfAttributes.OKOPF_ATTRIBUTES,
OkopfRecords.OKOPF_RECORDS, OkopfRecords.OKOPF_RECORDS,
OrgOkved.ORG_OKVED OrgOkved.ORG_OKVED
); );

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

@ -6,7 +6,6 @@ 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.Files;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.InteractionLog; import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.InteractionLog;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.OkopfAttributes;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.OkopfRecords; 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.OrgOkved;
@ -27,11 +26,6 @@ public class Tables {
*/ */
public static final InteractionLog INTERACTION_LOG = InteractionLog.INTERACTION_LOG; public static final InteractionLog INTERACTION_LOG = InteractionLog.INTERACTION_LOG;
/**
* The table <code>public.okopf_attributes</code>.
*/
public static final OkopfAttributes OKOPF_ATTRIBUTES = OkopfAttributes.OKOPF_ATTRIBUTES;
/** /**
* The table <code>public.okopf_records</code>. * The table <code>public.okopf_records</code>.
*/ */

280
backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/tables/OkopfAttributes.java
View file

@ -1,280 +0,0 @@
/*
* 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.OkopfRecords.OkopfRecordsPath;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.records.OkopfAttributesRecord;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.UUID;
import org.jooq.Condition;
import org.jooq.Field;
import org.jooq.ForeignKey;
import org.jooq.InverseForeignKey;
import org.jooq.Name;
import org.jooq.Path;
import org.jooq.PlainSQL;
import org.jooq.QueryPart;
import org.jooq.Record;
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 OkopfAttributes extends TableImpl<OkopfAttributesRecord> {
private static final long serialVersionUID = 1L;
/**
* The reference instance of <code>public.okopf_attributes</code>
*/
public static final OkopfAttributes OKOPF_ATTRIBUTES = new OkopfAttributes();
/**
* The class holding records for this type
*/
@Override
public Class<OkopfAttributesRecord> getRecordType() {
return OkopfAttributesRecord.class;
}
/**
* The column <code>public.okopf_attributes.okopf_attribute_id</code>.
*/
public final TableField<OkopfAttributesRecord, UUID> OKOPF_ATTRIBUTE_ID = createField(DSL.name("okopf_attribute_id"), SQLDataType.UUID.nullable(false), this, "");
/**
* The column <code>public.okopf_attributes.attribute_name</code>.
*/
public final TableField<OkopfAttributesRecord, String> ATTRIBUTE_NAME = createField(DSL.name("attribute_name"), SQLDataType.VARCHAR, this, "");
private OkopfAttributes(Name alias, Table<OkopfAttributesRecord> aliased) {
this(alias, aliased, (Field<?>[]) null, null);
}
private OkopfAttributes(Name alias, Table<OkopfAttributesRecord> aliased, Field<?>[] parameters, Condition where) {
super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
}
/**
* Create an aliased <code>public.okopf_attributes</code> table reference
*/
public OkopfAttributes(String alias) {
this(DSL.name(alias), OKOPF_ATTRIBUTES);
}
/**
* Create an aliased <code>public.okopf_attributes</code> table reference
*/
public OkopfAttributes(Name alias) {
this(alias, OKOPF_ATTRIBUTES);
}
/**
* Create a <code>public.okopf_attributes</code> table reference
*/
public OkopfAttributes() {
this(DSL.name("okopf_attributes"), null);
}
public <O extends Record> OkopfAttributes(Table<O> path, ForeignKey<O, OkopfAttributesRecord> childPath, InverseForeignKey<O, OkopfAttributesRecord> parentPath) {
super(path, childPath, parentPath, OKOPF_ATTRIBUTES);
}
/**
* A subtype implementing {@link Path} for simplified path-based joins.
*/
public static class OkopfAttributesPath extends OkopfAttributes implements Path<OkopfAttributesRecord> {
public <O extends Record> OkopfAttributesPath(Table<O> path, ForeignKey<O, OkopfAttributesRecord> childPath, InverseForeignKey<O, OkopfAttributesRecord> parentPath) {
super(path, childPath, parentPath);
}
private OkopfAttributesPath(Name alias, Table<OkopfAttributesRecord> aliased) {
super(alias, aliased);
}
@Override
public OkopfAttributesPath as(String alias) {
return new OkopfAttributesPath(DSL.name(alias), this);
}
@Override
public OkopfAttributesPath as(Name alias) {
return new OkopfAttributesPath(alias, this);
}
@Override
public OkopfAttributesPath as(Table<?> alias) {
return new OkopfAttributesPath(alias.getQualifiedName(), this);
}
}
@Override
public Schema getSchema() {
return aliased() ? null : Public.PUBLIC;
}
@Override
public UniqueKey<OkopfAttributesRecord> getPrimaryKey() {
return Keys.OKOPF_ATTRIBUTES_PKEY;
}
@Override
public List<UniqueKey<OkopfAttributesRecord>> getUniqueKeys() {
return Arrays.asList(Keys.OKOPF_ATTRIBUTES_ATTRIBUTE_NAME_KEY);
}
private transient OkopfRecordsPath _okopfRecords;
/**
* Get the implicit to-many join path to the
* <code>public.okopf_records</code> table
*/
public OkopfRecordsPath okopfRecords() {
if (_okopfRecords == null)
_okopfRecords = new OkopfRecordsPath(this, null, Keys.OKOPF_RECORDS__OKOPF_RECORDS_ATTRIBUTE_ID_FKEY.getInverseKey());
return _okopfRecords;
}
@Override
public OkopfAttributes as(String alias) {
return new OkopfAttributes(DSL.name(alias), this);
}
@Override
public OkopfAttributes as(Name alias) {
return new OkopfAttributes(alias, this);
}
@Override
public OkopfAttributes as(Table<?> alias) {
return new OkopfAttributes(alias.getQualifiedName(), this);
}
/**
* Rename this table
*/
@Override
public OkopfAttributes rename(String name) {
return new OkopfAttributes(DSL.name(name), null);
}
/**
* Rename this table
*/
@Override
public OkopfAttributes rename(Name name) {
return new OkopfAttributes(name, null);
}
/**
* Rename this table
*/
@Override
public OkopfAttributes rename(Table<?> name) {
return new OkopfAttributes(name.getQualifiedName(), null);
}
/**
* Create an inline derived table from this table
*/
@Override
public OkopfAttributes where(Condition condition) {
return new OkopfAttributes(getQualifiedName(), aliased() ? this : null, null, condition);
}
/**
* Create an inline derived table from this table
*/
@Override
public OkopfAttributes where(Collection<? extends Condition> conditions) {
return where(DSL.and(conditions));
}
/**
* Create an inline derived table from this table
*/
@Override
public OkopfAttributes where(Condition... conditions) {
return where(DSL.and(conditions));
}
/**
* Create an inline derived table from this table
*/
@Override
public OkopfAttributes where(Field<Boolean> condition) {
return where(DSL.condition(condition));
}
/**
* Create an inline derived table from this table
*/
@Override
@PlainSQL
public OkopfAttributes where(SQL condition) {
return where(DSL.condition(condition));
}
/**
* Create an inline derived table from this table
*/
@Override
@PlainSQL
public OkopfAttributes where(@Stringly.SQL String condition) {
return where(DSL.condition(condition));
}
/**
* Create an inline derived table from this table
*/
@Override
@PlainSQL
public OkopfAttributes where(@Stringly.SQL String condition, Object... binds) {
return where(DSL.condition(condition, binds));
}
/**
* Create an inline derived table from this table
*/
@Override
@PlainSQL
public OkopfAttributes where(@Stringly.SQL String condition, QueryPart... parts) {
return where(DSL.condition(condition, parts));
}
/**
* Create an inline derived table from this table
*/
@Override
public OkopfAttributes whereExists(Select<?> select) {
return where(DSL.exists(select));
}
/**
* Create an inline derived table from this table
*/
@Override
public OkopfAttributes whereNotExists(Select<?> select) {
return where(DSL.notExists(select));
}
}

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

@ -6,24 +6,17 @@ 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_.Keys;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.Public; import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.Public;
import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.OkopfAttributes.OkopfAttributesPath;
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.OkopfRecordsRecord;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.UUID;
import org.jooq.Condition; import org.jooq.Condition;
import org.jooq.Field; import org.jooq.Field;
import org.jooq.ForeignKey;
import org.jooq.Identity;
import org.jooq.InverseForeignKey;
import org.jooq.Name; import org.jooq.Name;
import org.jooq.Path;
import org.jooq.PlainSQL; import org.jooq.PlainSQL;
import org.jooq.QueryPart; import org.jooq.QueryPart;
import org.jooq.Record;
import org.jooq.SQL; import org.jooq.SQL;
import org.jooq.Schema; import org.jooq.Schema;
import org.jooq.Select; import org.jooq.Select;
@ -59,29 +52,19 @@ public class OkopfRecords extends TableImpl<OkopfRecordsRecord> {
} }
/** /**
* The column <code>public.okopf_records.okopf_record_id</code>. * The column <code>public.okopf_records.okopf_records_id</code>.
*/ */
public final TableField<OkopfRecordsRecord, Long> OKOPF_RECORD_ID = createField(DSL.name("okopf_record_id"), SQLDataType.BIGINT.nullable(false).identity(true), this, ""); 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.record_id</code>. * The column <code>public.okopf_records.name</code>.
*/ */
public final TableField<OkopfRecordsRecord, UUID> RECORD_ID = createField(DSL.name("record_id"), SQLDataType.UUID.nullable(false), this, ""); public final TableField<OkopfRecordsRecord, String> NAME = createField(DSL.name("name"), SQLDataType.VARCHAR, this, "");
/**
* The column <code>public.okopf_records.attribute_id</code>.
*/
public final TableField<OkopfRecordsRecord, UUID> ATTRIBUTE_ID = createField(DSL.name("attribute_id"), SQLDataType.UUID.nullable(false), this, "");
/**
* The column <code>public.okopf_records.value</code>.
*/
public final TableField<OkopfRecordsRecord, String> VALUE = createField(DSL.name("value"), SQLDataType.VARCHAR, this, "");
/** /**
* The column <code>public.okopf_records.version</code>. * The column <code>public.okopf_records.version</code>.
*/ */
public final TableField<OkopfRecordsRecord, String> VERSION = createField(DSL.name("version"), SQLDataType.VARCHAR.nullable(false), this, ""); public final TableField<OkopfRecordsRecord, Integer> VERSION = createField(DSL.name("version"), SQLDataType.INTEGER.nullable(false), this, "");
private OkopfRecords(Name alias, Table<OkopfRecordsRecord> aliased) { private OkopfRecords(Name alias, Table<OkopfRecordsRecord> aliased) {
this(alias, aliased, (Field<?>[]) null, null); this(alias, aliased, (Field<?>[]) null, null);
@ -112,47 +95,11 @@ public class OkopfRecords extends TableImpl<OkopfRecordsRecord> {
this(DSL.name("okopf_records"), null); this(DSL.name("okopf_records"), null);
} }
public <O extends Record> OkopfRecords(Table<O> path, ForeignKey<O, OkopfRecordsRecord> childPath, InverseForeignKey<O, OkopfRecordsRecord> parentPath) {
super(path, childPath, parentPath, OKOPF_RECORDS);
}
/**
* A subtype implementing {@link Path} for simplified path-based joins.
*/
public static class OkopfRecordsPath extends OkopfRecords implements Path<OkopfRecordsRecord> {
public <O extends Record> OkopfRecordsPath(Table<O> path, ForeignKey<O, OkopfRecordsRecord> childPath, InverseForeignKey<O, OkopfRecordsRecord> parentPath) {
super(path, childPath, parentPath);
}
private OkopfRecordsPath(Name alias, Table<OkopfRecordsRecord> aliased) {
super(alias, aliased);
}
@Override
public OkopfRecordsPath as(String alias) {
return new OkopfRecordsPath(DSL.name(alias), this);
}
@Override
public OkopfRecordsPath as(Name alias) {
return new OkopfRecordsPath(alias, this);
}
@Override
public OkopfRecordsPath as(Table<?> alias) {
return new OkopfRecordsPath(alias.getQualifiedName(), this);
}
}
@Override @Override
public Schema getSchema() { public Schema getSchema() {
return aliased() ? null : Public.PUBLIC; return aliased() ? null : Public.PUBLIC;
} }
@Override
public Identity<OkopfRecordsRecord, Long> getIdentity() {
return (Identity<OkopfRecordsRecord, Long>) super.getIdentity();
}
@Override @Override
public UniqueKey<OkopfRecordsRecord> getPrimaryKey() { public UniqueKey<OkopfRecordsRecord> getPrimaryKey() {
return Keys.OKOPF_RECORDS_PKEY; return Keys.OKOPF_RECORDS_PKEY;
@ -160,25 +107,7 @@ public class OkopfRecords extends TableImpl<OkopfRecordsRecord> {
@Override @Override
public List<UniqueKey<OkopfRecordsRecord>> getUniqueKeys() { public List<UniqueKey<OkopfRecordsRecord>> getUniqueKeys() {
return Arrays.asList(Keys.UNI_RECORD_UID_ATTRIBUTE_UID); return Arrays.asList(Keys.OKOPF_RECORDS_NAME_KEY);
}
@Override
public List<ForeignKey<OkopfRecordsRecord, ?>> getReferences() {
return Arrays.asList(Keys.OKOPF_RECORDS__OKOPF_RECORDS_ATTRIBUTE_ID_FKEY);
}
private transient OkopfAttributesPath _okopfAttributes;
/**
* Get the implicit join path to the <code>public.okopf_attributes</code>
* table.
*/
public OkopfAttributesPath okopfAttributes() {
if (_okopfAttributes == null)
_okopfAttributes = new OkopfAttributesPath(this, Keys.OKOPF_RECORDS__OKOPF_RECORDS_ATTRIBUTE_ID_FKEY, null);
return _okopfAttributes;
} }
@Override @Override

81
backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/tables/records/OkopfAttributesRecord.java
View file

@ -1,81 +0,0 @@
/*
* 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.OkopfAttributes;
import java.util.UUID;
import org.jooq.Record1;
import org.jooq.impl.UpdatableRecordImpl;
/**
* This class is generated by jOOQ.
*/
@SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class OkopfAttributesRecord extends UpdatableRecordImpl<OkopfAttributesRecord> {
private static final long serialVersionUID = 1L;
/**
* Setter for <code>public.okopf_attributes.okopf_attribute_id</code>.
*/
public void setOkopfAttributeId(UUID value) {
set(0, value);
}
/**
* Getter for <code>public.okopf_attributes.okopf_attribute_id</code>.
*/
public UUID getOkopfAttributeId() {
return (UUID) get(0);
}
/**
* Setter for <code>public.okopf_attributes.attribute_name</code>.
*/
public void setAttributeName(String value) {
set(1, value);
}
/**
* Getter for <code>public.okopf_attributes.attribute_name</code>.
*/
public String getAttributeName() {
return (String) get(1);
}
// -------------------------------------------------------------------------
// Primary key information
// -------------------------------------------------------------------------
@Override
public Record1<UUID> key() {
return (Record1) super.key();
}
// -------------------------------------------------------------------------
// Constructors
// -------------------------------------------------------------------------
/**
* Create a detached OkopfAttributesRecord
*/
public OkopfAttributesRecord() {
super(OkopfAttributes.OKOPF_ATTRIBUTES);
}
/**
* Create a detached, initialised OkopfAttributesRecord
*/
public OkopfAttributesRecord(UUID okopfAttributeId, String attributeName) {
super(OkopfAttributes.OKOPF_ATTRIBUTES);
setOkopfAttributeId(okopfAttributeId);
setAttributeName(attributeName);
resetChangedOnNotNull();
}
}

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

@ -6,8 +6,6 @@ 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 ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.OkopfRecords;
import java.util.UUID;
import org.jooq.Record1; import org.jooq.Record1;
import org.jooq.impl.UpdatableRecordImpl; import org.jooq.impl.UpdatableRecordImpl;
@ -21,73 +19,45 @@ public class OkopfRecordsRecord extends UpdatableRecordImpl<OkopfRecordsRecord>
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* Setter for <code>public.okopf_records.okopf_record_id</code>. * Setter for <code>public.okopf_records.okopf_records_id</code>.
*/ */
public void setOkopfRecordId(Long value) { public void setOkopfRecordsId(String value) {
set(0, value); set(0, value);
} }
/** /**
* Getter for <code>public.okopf_records.okopf_record_id</code>. * Getter for <code>public.okopf_records.okopf_records_id</code>.
*/ */
public Long getOkopfRecordId() { public String getOkopfRecordsId() {
return (Long) get(0); return (String) get(0);
} }
/** /**
* Setter for <code>public.okopf_records.record_id</code>. * Setter for <code>public.okopf_records.name</code>.
*/ */
public void setRecordId(UUID value) { public void setName(String value) {
set(1, value); set(1, value);
} }
/** /**
* Getter for <code>public.okopf_records.record_id</code>. * Getter for <code>public.okopf_records.name</code>.
*/ */
public UUID getRecordId() { public String getName() {
return (UUID) get(1); return (String) get(1);
}
/**
* Setter for <code>public.okopf_records.attribute_id</code>.
*/
public void setAttributeId(UUID value) {
set(2, value);
}
/**
* Getter for <code>public.okopf_records.attribute_id</code>.
*/
public UUID getAttributeId() {
return (UUID) get(2);
}
/**
* Setter for <code>public.okopf_records.value</code>.
*/
public void setValue(String value) {
set(3, value);
}
/**
* Getter for <code>public.okopf_records.value</code>.
*/
public String getValue() {
return (String) get(3);
} }
/** /**
* Setter for <code>public.okopf_records.version</code>. * Setter for <code>public.okopf_records.version</code>.
*/ */
public void setVersion(String value) { public void setVersion(Integer value) {
set(4, value); set(2, value);
} }
/** /**
* Getter for <code>public.okopf_records.version</code>. * Getter for <code>public.okopf_records.version</code>.
*/ */
public String getVersion() { public Integer getVersion() {
return (String) get(4); return (Integer) get(2);
} }
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
@ -95,7 +65,7 @@ public class OkopfRecordsRecord extends UpdatableRecordImpl<OkopfRecordsRecord>
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
@Override @Override
public Record1<Long> key() { public Record1<String> key() {
return (Record1) super.key(); return (Record1) super.key();
} }
@ -113,13 +83,11 @@ public class OkopfRecordsRecord extends UpdatableRecordImpl<OkopfRecordsRecord>
/** /**
* Create a detached, initialised OkopfRecordsRecord * Create a detached, initialised OkopfRecordsRecord
*/ */
public OkopfRecordsRecord(Long okopfRecordId, UUID recordId, UUID attributeId, String value, String version) { public OkopfRecordsRecord(String okopfRecordsId, String name, Integer version) {
super(OkopfRecords.OKOPF_RECORDS); super(OkopfRecords.OKOPF_RECORDS);
setOkopfRecordId(okopfRecordId); setOkopfRecordsId(okopfRecordsId);
setRecordId(recordId); setName(name);
setAttributeId(attributeId);
setValue(value);
setVersion(version); setVersion(version);
resetChangedOnNotNull(); resetChangedOnNotNull();
} }

4
config.md
View file

@ -689,8 +689,8 @@ JBPM использует 3 корневых категории логирова
Свойства задаются в файле config/standalone/dev/standalone.xml Свойства задаются в файле config/standalone/dev/standalone.xml
## Параметры ## Параметры
- `esnsi.okopf.url` - настройка, которая обращается к еснси для получения справочника и скачивает данные спровочников организации в виде заархивированного json файл. - `esnsi.okopf.url` - url который обращается к еснси для получения справочника и скачивает данные спровочников организации в виде заархивированного json файл.
- `esnsi.okopf.cron.load` - указываем расписание для загрузки справочника окопф и сохранения данных по справкам в БД - `esnsi.okopf.cron.load` - настройка, которая указывет расписание для загрузки справочника окопф и сохранения данных по справкам в БД
# Описание параметров конфигурации клиентской части # Описание параметров конфигурации клиентской части