diff --git a/backend/src/main/java/ervu/client/classified/EsnsiOkopfClient.java b/backend/src/main/java/ervu/client/classified/EsnsiOkopfClient.java index eb39eccf..7a22b36d 100644 --- a/backend/src/main/java/ervu/client/classified/EsnsiOkopfClient.java +++ b/backend/src/main/java/ervu/client/classified/EsnsiOkopfClient.java @@ -24,7 +24,7 @@ public class EsnsiOkopfClient { private static final Logger logger = LoggerFactory.getLogger(EsnsiOkopfClient.class); - @Value("${esnsi.okopf.url:#{null}") + @Value("${esnsi.okopf.url:#{null}}") private String uri; @Retryable(value = {TimeoutException.class}, backoff = diff --git a/backend/src/main/java/ervu/dao/classifier/OkopfRecordDaoImpl.java b/backend/src/main/java/ervu/dao/classifier/OkopfRecordDaoImpl.java index 598394ce..b3d90f28 100644 --- a/backend/src/main/java/ervu/dao/classifier/OkopfRecordDaoImpl.java +++ b/backend/src/main/java/ervu/dao/classifier/OkopfRecordDaoImpl.java @@ -1,13 +1,12 @@ package ervu.dao.classifier; -import java.util.UUID; +import java.util.List; import ervu.service.classifier.model.OkopfRecordModel; import org.jooq.DSLContext; import org.springframework.beans.factory.annotation.Autowired; 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; @@ -21,62 +20,24 @@ public class OkopfRecordDaoImpl implements OkopfRecordDao { private DSLContext dsl; @Override - public void save(OkopfRecordModel[] recordModels, String version) { -// var queries = Arrays.stream(recordModels) -// .flatMap(it -> Arrays.stream(it.getOkopfRecords()) -// .map(attribute -> { -// var recordUid = UUID.fromString(it.getUid()); -// var attributeUid = UUID.fromString(attribute.getAttributeUid()); -// var value = attribute.getValue(); -// -// return dsl.insertInto(OKOPF_RECORDS, -// 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(); - } + public void save(List recordModels, int version) { + var queries = recordModels.stream().map(record -> + dsl.insertInto(OKOPF_RECORDS, OKOPF_RECORDS.OKOPF_RECORDS_ID, OKOPF_RECORDS.NAME, OKOPF_RECORDS.VERSION) + .values(record.getCode(), record.getName(), version) + .onConflict(OKOPF_RECORDS.OKOPF_RECORDS_ID) + .doUpdate() + .set(OKOPF_RECORDS.NAME, record.getName()) + .set(OKOPF_RECORDS.VERSION, version) + .where(OKOPF_RECORDS.OKOPF_RECORDS_ID.eq(record.getCode()))).toList(); - @Override - public String fetchVersion() { - return dsl.select(OKOPF_RECORDS.VERSION) - .from(OKOPF_RECORDS) - .limit(1) - .fetchOptional(OKOPF_RECORDS.VERSION) - .orElse("0"); + dsl.batch(queries).execute(); } @Override public String fetchTitleByLeg(String leg) { - return dsl.select(OKOPF_RECORDS.VALUE) + return dsl.select(OKOPF_RECORDS.NAME) .from(OKOPF_RECORDS) - .join(OKOPF_ATTRIBUTES) - .on(OKOPF_RECORDS.ATTRIBUTE_ID.eq(OKOPF_ATTRIBUTES.OKOPF_ATTRIBUTE_ID)) - .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(); + .where(OKOPF_RECORDS.OKOPF_RECORDS_ID.eq(leg)) + .fetchOne(OKOPF_RECORDS.NAME); } } diff --git a/backend/src/main/java/ervu/service/scheduer/EsnsiOkopfSchedulerServiceImpl.java b/backend/src/main/java/ervu/service/scheduer/EsnsiOkopfSchedulerServiceImpl.java index b9e389bd..336854a4 100644 --- a/backend/src/main/java/ervu/service/scheduer/EsnsiOkopfSchedulerServiceImpl.java +++ b/backend/src/main/java/ervu/service/scheduer/EsnsiOkopfSchedulerServiceImpl.java @@ -9,6 +9,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; import ervu.client.classified.EsnsiOkopfClient; import ervu.dao.classifier.OkopfRecordDao; import ervu.service.classifier.model.OkopfRecordModel; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; @@ -19,6 +21,8 @@ import org.springframework.transaction.annotation.Transactional; */ @Service public class EsnsiOkopfSchedulerServiceImpl implements EsnsiOkopfSchedulerService { + private static final Logger logger = LoggerFactory.getLogger(EsnsiOkopfSchedulerServiceImpl.class); + @Autowired private EsnsiOkopfClient esnsiOkopfClient; @Autowired @@ -29,6 +33,7 @@ public class EsnsiOkopfSchedulerServiceImpl implements EsnsiOkopfSchedulerServic @Scheduled(cron = "${esnsi.okopf.cron:0 0 */1 * * *}") @Transactional public void load() { + logger.info("Starting scheduller load okopf...."); String data = esnsiOkopfClient.getJsonOkopFormData(); try { List okopfRecords = mapToOkopfRecords(data); @@ -49,9 +54,8 @@ public class EsnsiOkopfSchedulerServiceImpl implements EsnsiOkopfSchedulerServic String name = null; for (JsonNode record : attributeValues) { String value = record.get("value").asText(); - if (value.matches("\\d+")) { + if (value.matches("\\d+")) code = value; - } else { name = value; break; diff --git a/backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/Keys.java b/backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/Keys.java index e8cc1a05..2b603494 100644 --- a/backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/Keys.java +++ b/backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/Keys.java @@ -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.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.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.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.OrgOkvedRecord; -import org.jooq.ForeignKey; import org.jooq.TableField; import org.jooq.UniqueKey; import org.jooq.impl.DSL; @@ -35,15 +32,7 @@ public class Keys { public static final UniqueKey FILES_PKEY = Internal.createUniqueKey(Files.FILES, DSL.name("files_pkey"), new TableField[] { Files.FILES.FILE_ID }, true); public static final UniqueKey INTERACTION_LOG_PKEY = Internal.createUniqueKey(InteractionLog.INTERACTION_LOG, DSL.name("interaction_log_pkey"), new TableField[] { InteractionLog.INTERACTION_LOG.ID }, true); - public static final UniqueKey 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 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 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 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 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 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 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 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); } diff --git a/backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/Public.java b/backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/Public.java index 634fe99a..fe090649 100644 --- a/backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/Public.java +++ b/backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/Public.java @@ -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.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.OkopfAttributes; import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.OkopfRecords; 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; - /** - * The table public.okopf_attributes. - */ - public final OkopfAttributes OKOPF_ATTRIBUTES = OkopfAttributes.OKOPF_ATTRIBUTES; - /** * The table public.okopf_records. */ @@ -75,7 +69,6 @@ public class Public extends SchemaImpl { return Arrays.asList( Files.FILES, InteractionLog.INTERACTION_LOG, - OkopfAttributes.OKOPF_ATTRIBUTES, OkopfRecords.OKOPF_RECORDS, OrgOkved.ORG_OKVED ); diff --git a/backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/Tables.java b/backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/Tables.java index cbb030fb..0f51d8da 100644 --- a/backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/Tables.java +++ b/backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/Tables.java @@ -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.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.OrgOkved; @@ -27,11 +26,6 @@ public class Tables { */ public static final InteractionLog INTERACTION_LOG = InteractionLog.INTERACTION_LOG; - /** - * The table public.okopf_attributes. - */ - public static final OkopfAttributes OKOPF_ATTRIBUTES = OkopfAttributes.OKOPF_ATTRIBUTES; - /** * The table public.okopf_records. */ diff --git a/backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/tables/OkopfAttributes.java b/backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/tables/OkopfAttributes.java deleted file mode 100644 index 305f7f7b..00000000 --- a/backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/tables/OkopfAttributes.java +++ /dev/null @@ -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 { - - private static final long serialVersionUID = 1L; - - /** - * The reference instance of public.okopf_attributes - */ - public static final OkopfAttributes OKOPF_ATTRIBUTES = new OkopfAttributes(); - - /** - * The class holding records for this type - */ - @Override - public Class getRecordType() { - return OkopfAttributesRecord.class; - } - - /** - * The column public.okopf_attributes.okopf_attribute_id. - */ - public final TableField OKOPF_ATTRIBUTE_ID = createField(DSL.name("okopf_attribute_id"), SQLDataType.UUID.nullable(false), this, ""); - - /** - * The column public.okopf_attributes.attribute_name. - */ - public final TableField ATTRIBUTE_NAME = createField(DSL.name("attribute_name"), SQLDataType.VARCHAR, this, ""); - - private OkopfAttributes(Name alias, Table aliased) { - this(alias, aliased, (Field[]) null, null); - } - - private OkopfAttributes(Name alias, Table aliased, Field[] parameters, Condition where) { - super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where); - } - - /** - * Create an aliased public.okopf_attributes table reference - */ - public OkopfAttributes(String alias) { - this(DSL.name(alias), OKOPF_ATTRIBUTES); - } - - /** - * Create an aliased public.okopf_attributes table reference - */ - public OkopfAttributes(Name alias) { - this(alias, OKOPF_ATTRIBUTES); - } - - /** - * Create a public.okopf_attributes table reference - */ - public OkopfAttributes() { - this(DSL.name("okopf_attributes"), null); - } - - public OkopfAttributes(Table path, ForeignKey childPath, InverseForeignKey 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 { - public OkopfAttributesPath(Table path, ForeignKey childPath, InverseForeignKey parentPath) { - super(path, childPath, parentPath); - } - private OkopfAttributesPath(Name alias, Table 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 getPrimaryKey() { - return Keys.OKOPF_ATTRIBUTES_PKEY; - } - - @Override - public List> getUniqueKeys() { - return Arrays.asList(Keys.OKOPF_ATTRIBUTES_ATTRIBUTE_NAME_KEY); - } - - private transient OkopfRecordsPath _okopfRecords; - - /** - * Get the implicit to-many join path to the - * public.okopf_records 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 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 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)); - } -} diff --git a/backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/tables/OkopfRecords.java b/backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/tables/OkopfRecords.java index a05e0012..67e06a92 100644 --- a/backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/tables/OkopfRecords.java +++ b/backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/tables/OkopfRecords.java @@ -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_.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 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.Identity; -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; @@ -59,29 +52,19 @@ public class OkopfRecords extends TableImpl { } /** - * The column public.okopf_records.okopf_record_id. + * The column public.okopf_records.okopf_records_id. */ - public final TableField OKOPF_RECORD_ID = createField(DSL.name("okopf_record_id"), SQLDataType.BIGINT.nullable(false).identity(true), this, ""); + public final TableField OKOPF_RECORDS_ID = createField(DSL.name("okopf_records_id"), SQLDataType.VARCHAR.nullable(false), this, ""); /** - * The column public.okopf_records.record_id. + * The column public.okopf_records.name. */ - public final TableField RECORD_ID = createField(DSL.name("record_id"), SQLDataType.UUID.nullable(false), this, ""); - - /** - * The column public.okopf_records.attribute_id. - */ - public final TableField ATTRIBUTE_ID = createField(DSL.name("attribute_id"), SQLDataType.UUID.nullable(false), this, ""); - - /** - * The column public.okopf_records.value. - */ - public final TableField VALUE = createField(DSL.name("value"), SQLDataType.VARCHAR, this, ""); + public final TableField NAME = createField(DSL.name("name"), SQLDataType.VARCHAR, this, ""); /** * The column public.okopf_records.version. */ - public final TableField VERSION = createField(DSL.name("version"), SQLDataType.VARCHAR.nullable(false), this, ""); + public final TableField VERSION = createField(DSL.name("version"), SQLDataType.INTEGER.nullable(false), this, ""); private OkopfRecords(Name alias, Table aliased) { this(alias, aliased, (Field[]) null, null); @@ -112,47 +95,11 @@ public class OkopfRecords extends TableImpl { this(DSL.name("okopf_records"), null); } - public OkopfRecords(Table path, ForeignKey childPath, InverseForeignKey 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 { - public OkopfRecordsPath(Table path, ForeignKey childPath, InverseForeignKey parentPath) { - super(path, childPath, parentPath); - } - private OkopfRecordsPath(Name alias, Table 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 public Schema getSchema() { return aliased() ? null : Public.PUBLIC; } - @Override - public Identity getIdentity() { - return (Identity) super.getIdentity(); - } - @Override public UniqueKey getPrimaryKey() { return Keys.OKOPF_RECORDS_PKEY; @@ -160,25 +107,7 @@ public class OkopfRecords extends TableImpl { @Override public List> getUniqueKeys() { - return Arrays.asList(Keys.UNI_RECORD_UID_ATTRIBUTE_UID); - } - - @Override - public List> getReferences() { - return Arrays.asList(Keys.OKOPF_RECORDS__OKOPF_RECORDS_ATTRIBUTE_ID_FKEY); - } - - private transient OkopfAttributesPath _okopfAttributes; - - /** - * Get the implicit join path to the public.okopf_attributes - * table. - */ - public OkopfAttributesPath okopfAttributes() { - if (_okopfAttributes == null) - _okopfAttributes = new OkopfAttributesPath(this, Keys.OKOPF_RECORDS__OKOPF_RECORDS_ATTRIBUTE_ID_FKEY, null); - - return _okopfAttributes; + return Arrays.asList(Keys.OKOPF_RECORDS_NAME_KEY); } @Override diff --git a/backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/tables/records/OkopfAttributesRecord.java b/backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/tables/records/OkopfAttributesRecord.java deleted file mode 100644 index 1adfce90..00000000 --- a/backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/tables/records/OkopfAttributesRecord.java +++ /dev/null @@ -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 { - - private static final long serialVersionUID = 1L; - - /** - * Setter for public.okopf_attributes.okopf_attribute_id. - */ - public void setOkopfAttributeId(UUID value) { - set(0, value); - } - - /** - * Getter for public.okopf_attributes.okopf_attribute_id. - */ - public UUID getOkopfAttributeId() { - return (UUID) get(0); - } - - /** - * Setter for public.okopf_attributes.attribute_name. - */ - public void setAttributeName(String value) { - set(1, value); - } - - /** - * Getter for public.okopf_attributes.attribute_name. - */ - public String getAttributeName() { - return (String) get(1); - } - - // ------------------------------------------------------------------------- - // Primary key information - // ------------------------------------------------------------------------- - - @Override - public Record1 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(); - } -} diff --git a/backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/tables/records/OkopfRecordsRecord.java b/backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/tables/records/OkopfRecordsRecord.java index 8cedb64e..2849d05f 100644 --- a/backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/tables/records/OkopfRecordsRecord.java +++ b/backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/tables/records/OkopfRecordsRecord.java @@ -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 java.util.UUID; - import org.jooq.Record1; import org.jooq.impl.UpdatableRecordImpl; @@ -21,73 +19,45 @@ public class OkopfRecordsRecord extends UpdatableRecordImpl private static final long serialVersionUID = 1L; /** - * Setter for public.okopf_records.okopf_record_id. + * Setter for public.okopf_records.okopf_records_id. */ - public void setOkopfRecordId(Long value) { + public void setOkopfRecordsId(String value) { set(0, value); } /** - * Getter for public.okopf_records.okopf_record_id. + * Getter for public.okopf_records.okopf_records_id. */ - public Long getOkopfRecordId() { - return (Long) get(0); + public String getOkopfRecordsId() { + return (String) get(0); } /** - * Setter for public.okopf_records.record_id. + * Setter for public.okopf_records.name. */ - public void setRecordId(UUID value) { + public void setName(String value) { set(1, value); } /** - * Getter for public.okopf_records.record_id. + * Getter for public.okopf_records.name. */ - public UUID getRecordId() { - return (UUID) get(1); - } - - /** - * Setter for public.okopf_records.attribute_id. - */ - public void setAttributeId(UUID value) { - set(2, value); - } - - /** - * Getter for public.okopf_records.attribute_id. - */ - public UUID getAttributeId() { - return (UUID) get(2); - } - - /** - * Setter for public.okopf_records.value. - */ - public void setValue(String value) { - set(3, value); - } - - /** - * Getter for public.okopf_records.value. - */ - public String getValue() { - return (String) get(3); + public String getName() { + return (String) get(1); } /** * Setter for public.okopf_records.version. */ - public void setVersion(String value) { - set(4, value); + public void setVersion(Integer value) { + set(2, value); } /** * Getter for public.okopf_records.version. */ - public String getVersion() { - return (String) get(4); + public Integer getVersion() { + return (Integer) get(2); } // ------------------------------------------------------------------------- @@ -95,7 +65,7 @@ public class OkopfRecordsRecord extends UpdatableRecordImpl // ------------------------------------------------------------------------- @Override - public Record1 key() { + public Record1 key() { return (Record1) super.key(); } @@ -113,13 +83,11 @@ public class OkopfRecordsRecord extends UpdatableRecordImpl /** * 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); - setOkopfRecordId(okopfRecordId); - setRecordId(recordId); - setAttributeId(attributeId); - setValue(value); + setOkopfRecordsId(okopfRecordsId); + setName(name); setVersion(version); resetChangedOnNotNull(); } diff --git a/config.md b/config.md index 5ee355dd..d22f9b38 100644 --- a/config.md +++ b/config.md @@ -689,8 +689,8 @@ JBPM использует 3 корневых категории логирова Свойства задаются в файле config/standalone/dev/standalone.xml ## Параметры -- `esnsi.okopf.url` - настройка, которая обращается к еснси для получения справочника и скачивает данные спровочников организации в виде заархивированного json файл. -- `esnsi.okopf.cron.load` - указываем расписание для загрузки справочника окопф и сохранения данных по справкам в БД +- `esnsi.okopf.url` - url который обращается к еснси для получения справочника и скачивает данные спровочников организации в виде заархивированного json файл. +- `esnsi.okopf.cron.load` - настройка, которая указывет расписание для загрузки справочника окопф и сохранения данных по справкам в БД # Описание параметров конфигурации клиентской части