diff --git a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/auth/Auth.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/auth/Auth.java index 5ad6d3e..a0875e9 100644 --- a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/auth/Auth.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/auth/Auth.java @@ -30,7 +30,7 @@ public class Auth extends SchemaImpl { public static final Auth AUTH = new Auth(); /** - * The table auth.active_session. + * Активные сессии пользователей */ public final ActiveSession ACTIVE_SESSION = ActiveSession.ACTIVE_SESSION; diff --git a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/auth/Tables.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/auth/Tables.java index f657710..e856b63 100644 --- a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/auth/Tables.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/auth/Tables.java @@ -15,7 +15,7 @@ import ru.micord.webbpm.ervu.business_metrics.db_beans.auth.tables.FailedAuth; public class Tables { /** - * The table auth.active_session. + * Активные сессии пользователей */ public static final ActiveSession ACTIVE_SESSION = ActiveSession.ACTIVE_SESSION; diff --git a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/auth/tables/ActiveSession.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/auth/tables/ActiveSession.java index 0137835..6597c51 100644 --- a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/auth/tables/ActiveSession.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/auth/tables/ActiveSession.java @@ -29,7 +29,7 @@ import ru.micord.webbpm.ervu.business_metrics.db_beans.auth.tables.records.Activ /** - * This class is generated by jOOQ. + * Активные сессии пользователей */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class ActiveSession extends TableImpl { @@ -50,31 +50,35 @@ public class ActiveSession extends TableImpl { } /** - * The column auth.active_session.session_id. + * The column auth.active_session.session_id. Идентификатор + * сессии */ - public final TableField SESSION_ID = createField(DSL.name("session_id"), SQLDataType.VARCHAR(128).nullable(false), this, ""); + public final TableField SESSION_ID = createField(DSL.name("session_id"), SQLDataType.VARCHAR(128).nullable(false), this, "Идентификатор сессии"); /** - * The column auth.active_session.domain_id. + * The column auth.active_session.domain_id. Идентификатор + * домена */ - public final TableField DOMAIN_ID = createField(DSL.name("domain_id"), SQLDataType.VARCHAR(128).nullable(false), this, ""); + public final TableField DOMAIN_ID = createField(DSL.name("domain_id"), SQLDataType.VARCHAR(128).nullable(false), this, "Идентификатор домена"); /** - * The column auth.active_session.user_id. + * The column auth.active_session.user_id. Идентификатор + * пользователя */ - public final TableField USER_ID = createField(DSL.name("user_id"), SQLDataType.VARCHAR(128).nullable(false), this, ""); + public final TableField USER_ID = createField(DSL.name("user_id"), SQLDataType.VARCHAR(128).nullable(false), this, "Идентификатор пользователя"); /** - * The column auth.active_session.ip_address. + * The column auth.active_session.ip_address. IP-адрес + * пользователя */ - public final TableField IP_ADDRESS = createField(DSL.name("ip_address"), SQLDataType.VARCHAR(64), this, ""); + public final TableField IP_ADDRESS = createField(DSL.name("ip_address"), SQLDataType.VARCHAR(64), this, "IP-адрес пользователя"); private ActiveSession(Name alias, Table aliased) { this(alias, aliased, (Field[]) null, null); } private ActiveSession(Name alias, Table aliased, Field[] parameters, Condition where) { - super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where); + super(alias, null, aliased, parameters, DSL.comment("Активные сессии пользователей"), TableOptions.table(), where); } /** diff --git a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/auth/tables/records/ActiveSessionRecord.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/auth/tables/records/ActiveSessionRecord.java index 1ba994d..4372589 100644 --- a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/auth/tables/records/ActiveSessionRecord.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/auth/tables/records/ActiveSessionRecord.java @@ -11,7 +11,7 @@ import ru.micord.webbpm.ervu.business_metrics.db_beans.auth.tables.ActiveSession /** - * This class is generated by jOOQ. + * Активные сессии пользователей */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class ActiveSessionRecord extends UpdatableRecordImpl { @@ -19,56 +19,64 @@ public class ActiveSessionRecord extends UpdatableRecordImplauth.active_session.session_id. + * Setter for auth.active_session.session_id. Идентификатор + * сессии */ public void setSessionId(String value) { set(0, value); } /** - * Getter for auth.active_session.session_id. + * Getter for auth.active_session.session_id. Идентификатор + * сессии */ public String getSessionId() { return (String) get(0); } /** - * Setter for auth.active_session.domain_id. + * Setter for auth.active_session.domain_id. Идентификатор + * домена */ public void setDomainId(String value) { set(1, value); } /** - * Getter for auth.active_session.domain_id. + * Getter for auth.active_session.domain_id. Идентификатор + * домена */ public String getDomainId() { return (String) get(1); } /** - * Setter for auth.active_session.user_id. + * Setter for auth.active_session.user_id. Идентификатор + * пользователя */ public void setUserId(String value) { set(2, value); } /** - * Getter for auth.active_session.user_id. + * Getter for auth.active_session.user_id. Идентификатор + * пользователя */ public String getUserId() { return (String) get(2); } /** - * Setter for auth.active_session.ip_address. + * Setter for auth.active_session.ip_address. IP-адрес + * пользователя */ public void setIpAddress(String value) { set(3, value); } /** - * Getter for auth.active_session.ip_address. + * Getter for auth.active_session.ip_address. IP-адрес + * пользователя */ public String getIpAddress() { return (String) get(3); diff --git a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/idm_reconcile/IdmReconcile.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/idm_reconcile/IdmReconcile.java index 8574585..bd219b6 100644 --- a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/idm_reconcile/IdmReconcile.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/idm_reconcile/IdmReconcile.java @@ -13,6 +13,7 @@ import org.jooq.impl.SchemaImpl; import ru.micord.webbpm.ervu.business_metrics.db_beans.DefaultCatalog; import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.Account; +import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.AccountBlocked; import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.AccountRole; import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.Domain; import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.Role; @@ -36,6 +37,11 @@ public class IdmReconcile extends SchemaImpl { */ public final Account ACCOUNT = Account.ACCOUNT; + /** + * The table idm_reconcile.account_blocked. + */ + public final AccountBlocked ACCOUNT_BLOCKED = AccountBlocked.ACCOUNT_BLOCKED; + /** * The table idm_reconcile.account_role. */ @@ -68,6 +74,7 @@ public class IdmReconcile extends SchemaImpl { public final List> getTables() { return Arrays.asList( Account.ACCOUNT, + AccountBlocked.ACCOUNT_BLOCKED, AccountRole.ACCOUNT_ROLE, Domain.DOMAIN, Role.ROLE diff --git a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/idm_reconcile/Keys.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/idm_reconcile/Keys.java index cdf9869..cb5da3d 100644 --- a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/idm_reconcile/Keys.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/idm_reconcile/Keys.java @@ -11,9 +11,11 @@ import org.jooq.impl.DSL; import org.jooq.impl.Internal; import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.Account; +import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.AccountBlocked; import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.AccountRole; import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.Domain; import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.Role; +import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.records.AccountBlockedRecord; import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.records.AccountRecord; import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.records.AccountRoleRecord; import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.records.DomainRecord; @@ -32,6 +34,7 @@ public class Keys { // ------------------------------------------------------------------------- public static final UniqueKey ACCOUNT_PKEY = Internal.createUniqueKey(Account.ACCOUNT, DSL.name("account_pkey"), new TableField[] { Account.ACCOUNT.ID }, true); + public static final UniqueKey ACCOUNT_BLOCKED_PKEY = Internal.createUniqueKey(AccountBlocked.ACCOUNT_BLOCKED, DSL.name("account_blocked_pkey"), new TableField[] { AccountBlocked.ACCOUNT_BLOCKED.ID }, true); public static final UniqueKey PK_ACCOUNT_ROLE = Internal.createUniqueKey(AccountRole.ACCOUNT_ROLE, DSL.name("pk_account_role"), new TableField[] { AccountRole.ACCOUNT_ROLE.ACCOUNT_ID, AccountRole.ACCOUNT_ROLE.ROLE_ID }, true); public static final UniqueKey DOMAIN_PKEY = Internal.createUniqueKey(Domain.DOMAIN, DSL.name("domain_pkey"), new TableField[] { Domain.DOMAIN.ID }, true); public static final UniqueKey ROLE_PKEY = Internal.createUniqueKey(Role.ROLE, DSL.name("role_pkey"), new TableField[] { Role.ROLE.ID }, true); @@ -40,7 +43,5 @@ public class Keys { // FOREIGN KEY definitions // ------------------------------------------------------------------------- - public static final ForeignKey ACCOUNT__FK_DOMAIN = Internal.createForeignKey(Account.ACCOUNT, DSL.name("fk_domain"), new TableField[] { Account.ACCOUNT.DOMAIN_ID }, Keys.DOMAIN_PKEY, new TableField[] { Domain.DOMAIN.ID }, true); public static final ForeignKey ACCOUNT_ROLE__FK_ACCOUNT_ROLE_ACCOUNT = Internal.createForeignKey(AccountRole.ACCOUNT_ROLE, DSL.name("fk_account_role_account"), new TableField[] { AccountRole.ACCOUNT_ROLE.ACCOUNT_ID }, Keys.ACCOUNT_PKEY, new TableField[] { Account.ACCOUNT.ID }, true); - public static final ForeignKey ACCOUNT_ROLE__FK_ACCOUNT_ROLE_ROLE = Internal.createForeignKey(AccountRole.ACCOUNT_ROLE, DSL.name("fk_account_role_role"), new TableField[] { AccountRole.ACCOUNT_ROLE.ROLE_ID }, Keys.ROLE_PKEY, new TableField[] { Role.ROLE.ID }, true); } diff --git a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/idm_reconcile/Tables.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/idm_reconcile/Tables.java index 7001362..59b28d1 100644 --- a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/idm_reconcile/Tables.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/idm_reconcile/Tables.java @@ -5,6 +5,7 @@ package ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile; import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.Account; +import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.AccountBlocked; import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.AccountRole; import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.Domain; import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.Role; @@ -21,6 +22,11 @@ public class Tables { */ public static final Account ACCOUNT = Account.ACCOUNT; + /** + * The table idm_reconcile.account_blocked. + */ + public static final AccountBlocked ACCOUNT_BLOCKED = AccountBlocked.ACCOUNT_BLOCKED; + /** * The table idm_reconcile.account_role. */ diff --git a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/idm_reconcile/tables/Account.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/idm_reconcile/tables/Account.java index b955bcd..845d206 100644 --- a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/idm_reconcile/tables/Account.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/idm_reconcile/tables/Account.java @@ -5,9 +5,7 @@ package ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables; import java.sql.Timestamp; -import java.util.Arrays; import java.util.Collection; -import java.util.List; import org.jooq.Condition; import org.jooq.Field; @@ -33,8 +31,6 @@ import org.jooq.impl.TableImpl; import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.IdmReconcile; import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.Keys; import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.AccountRole.AccountRolePath; -import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.Domain.DomainPath; -import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.Role.RolePath; import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.records.AccountRecord; @@ -189,24 +185,6 @@ public class Account extends TableImpl { return Keys.ACCOUNT_PKEY; } - @Override - public List> getReferences() { - return Arrays.asList(Keys.ACCOUNT__FK_DOMAIN); - } - - private transient DomainPath _domain; - - /** - * Get the implicit join path to the idm_reconcile.domain - * table. - */ - public DomainPath domain() { - if (_domain == null) - _domain = new DomainPath(this, Keys.ACCOUNT__FK_DOMAIN, null); - - return _domain; - } - private transient AccountRolePath _accountRole; /** @@ -220,14 +198,6 @@ public class Account extends TableImpl { return _accountRole; } - /** - * Get the implicit many-to-many join path to the - * idm_reconcile.role table - */ - public RolePath role() { - return accountRole().role(); - } - @Override public Account as(String alias) { return new Account(DSL.name(alias), this); diff --git a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/idm_reconcile/tables/AccountBlocked.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/idm_reconcile/tables/AccountBlocked.java new file mode 100644 index 0000000..d6c580e --- /dev/null +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/idm_reconcile/tables/AccountBlocked.java @@ -0,0 +1,236 @@ +/* + * This file is generated by jOOQ. + */ +package ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables; + + +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; + +import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.IdmReconcile; +import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.Keys; +import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.records.AccountBlockedRecord; + + +/** + * This class is generated by jOOQ. + */ +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class AccountBlocked extends TableImpl { + + private static final long serialVersionUID = 1L; + + /** + * The reference instance of idm_reconcile.account_blocked + */ + public static final AccountBlocked ACCOUNT_BLOCKED = new AccountBlocked(); + + /** + * The class holding records for this type + */ + @Override + public Class getRecordType() { + return AccountBlockedRecord.class; + } + + /** + * The column idm_reconcile.account_blocked.account_id. + */ + public final TableField ACCOUNT_ID = createField(DSL.name("account_id"), SQLDataType.VARCHAR(36).nullable(false), this, ""); + + /** + * The column idm_reconcile.account_blocked.blocked. + */ + public final TableField BLOCKED = createField(DSL.name("blocked"), SQLDataType.BOOLEAN.defaultValue(DSL.field(DSL.raw("false"), SQLDataType.BOOLEAN)), this, ""); + + /** + * The column idm_reconcile.account_blocked.id. + */ + public final TableField ID = createField(DSL.name("id"), SQLDataType.BIGINT.nullable(false).identity(true), this, ""); + + private AccountBlocked(Name alias, Table aliased) { + this(alias, aliased, (Field[]) null, null); + } + + private AccountBlocked(Name alias, Table aliased, Field[] parameters, Condition where) { + super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where); + } + + /** + * Create an aliased idm_reconcile.account_blocked table + * reference + */ + public AccountBlocked(String alias) { + this(DSL.name(alias), ACCOUNT_BLOCKED); + } + + /** + * Create an aliased idm_reconcile.account_blocked table + * reference + */ + public AccountBlocked(Name alias) { + this(alias, ACCOUNT_BLOCKED); + } + + /** + * Create a idm_reconcile.account_blocked table reference + */ + public AccountBlocked() { + this(DSL.name("account_blocked"), null); + } + + @Override + public Schema getSchema() { + return aliased() ? null : IdmReconcile.IDM_RECONCILE; + } + + @Override + public Identity getIdentity() { + return (Identity) super.getIdentity(); + } + + @Override + public UniqueKey getPrimaryKey() { + return Keys.ACCOUNT_BLOCKED_PKEY; + } + + @Override + public AccountBlocked as(String alias) { + return new AccountBlocked(DSL.name(alias), this); + } + + @Override + public AccountBlocked as(Name alias) { + return new AccountBlocked(alias, this); + } + + @Override + public AccountBlocked as(Table alias) { + return new AccountBlocked(alias.getQualifiedName(), this); + } + + /** + * Rename this table + */ + @Override + public AccountBlocked rename(String name) { + return new AccountBlocked(DSL.name(name), null); + } + + /** + * Rename this table + */ + @Override + public AccountBlocked rename(Name name) { + return new AccountBlocked(name, null); + } + + /** + * Rename this table + */ + @Override + public AccountBlocked rename(Table name) { + return new AccountBlocked(name.getQualifiedName(), null); + } + + /** + * Create an inline derived table from this table + */ + @Override + public AccountBlocked where(Condition condition) { + return new AccountBlocked(getQualifiedName(), aliased() ? this : null, null, condition); + } + + /** + * Create an inline derived table from this table + */ + @Override + public AccountBlocked where(Collection conditions) { + return where(DSL.and(conditions)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public AccountBlocked where(Condition... conditions) { + return where(DSL.and(conditions)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public AccountBlocked where(Field condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public AccountBlocked where(SQL condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public AccountBlocked where(@Stringly.SQL String condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public AccountBlocked where(@Stringly.SQL String condition, Object... binds) { + return where(DSL.condition(condition, binds)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public AccountBlocked where(@Stringly.SQL String condition, QueryPart... parts) { + return where(DSL.condition(condition, parts)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public AccountBlocked whereExists(Select select) { + return where(DSL.exists(select)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public AccountBlocked whereNotExists(Select select) { + return where(DSL.notExists(select)); + } +} diff --git a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/idm_reconcile/tables/AccountRole.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/idm_reconcile/tables/AccountRole.java index e0a896c..7ad7d2b 100644 --- a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/idm_reconcile/tables/AccountRole.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/idm_reconcile/tables/AccountRole.java @@ -32,7 +32,6 @@ import org.jooq.impl.TableImpl; import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.IdmReconcile; import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.Keys; import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.Account.AccountPath; -import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.Role.RolePath; import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.records.AccountRoleRecord; @@ -139,7 +138,7 @@ public class AccountRole extends TableImpl { @Override public List> getReferences() { - return Arrays.asList(Keys.ACCOUNT_ROLE__FK_ACCOUNT_ROLE_ACCOUNT, Keys.ACCOUNT_ROLE__FK_ACCOUNT_ROLE_ROLE); + return Arrays.asList(Keys.ACCOUNT_ROLE__FK_ACCOUNT_ROLE_ACCOUNT); } private transient AccountPath _account; @@ -155,18 +154,6 @@ public class AccountRole extends TableImpl { return _account; } - private transient RolePath _role; - - /** - * Get the implicit join path to the idm_reconcile.role table. - */ - public RolePath role() { - if (_role == null) - _role = new RolePath(this, Keys.ACCOUNT_ROLE__FK_ACCOUNT_ROLE_ROLE, null); - - return _role; - } - @Override public AccountRole as(String alias) { return new AccountRole(DSL.name(alias), this); diff --git a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/idm_reconcile/tables/Domain.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/idm_reconcile/tables/Domain.java index f3e17b2..180c074 100644 --- a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/idm_reconcile/tables/Domain.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/idm_reconcile/tables/Domain.java @@ -9,13 +9,9 @@ import java.util.Collection; 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; @@ -30,7 +26,6 @@ import org.jooq.impl.TableImpl; import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.IdmReconcile; import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.Keys; -import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.Account.AccountPath; import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.records.DomainRecord; @@ -335,37 +330,6 @@ public class Domain extends TableImpl { this(DSL.name("domain"), null); } - public Domain(Table path, ForeignKey childPath, InverseForeignKey parentPath) { - super(path, childPath, parentPath, DOMAIN); - } - - /** - * A subtype implementing {@link Path} for simplified path-based joins. - */ - public static class DomainPath extends Domain implements Path { - public DomainPath(Table path, ForeignKey childPath, InverseForeignKey parentPath) { - super(path, childPath, parentPath); - } - private DomainPath(Name alias, Table aliased) { - super(alias, aliased); - } - - @Override - public DomainPath as(String alias) { - return new DomainPath(DSL.name(alias), this); - } - - @Override - public DomainPath as(Name alias) { - return new DomainPath(alias, this); - } - - @Override - public DomainPath as(Table alias) { - return new DomainPath(alias.getQualifiedName(), this); - } - } - @Override public Schema getSchema() { return aliased() ? null : IdmReconcile.IDM_RECONCILE; @@ -376,19 +340,6 @@ public class Domain extends TableImpl { return Keys.DOMAIN_PKEY; } - private transient AccountPath _account; - - /** - * Get the implicit to-many join path to the - * idm_reconcile.account table - */ - public AccountPath account() { - if (_account == null) - _account = new AccountPath(this, null, Keys.ACCOUNT__FK_DOMAIN.getInverseKey()); - - return _account; - } - @Override public Domain as(String alias) { return new Domain(DSL.name(alias), this); diff --git a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/idm_reconcile/tables/Role.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/idm_reconcile/tables/Role.java index d6a1afd..5660c20 100644 --- a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/idm_reconcile/tables/Role.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/idm_reconcile/tables/Role.java @@ -9,13 +9,9 @@ import java.util.Collection; 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; @@ -30,8 +26,6 @@ import org.jooq.impl.TableImpl; import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.IdmReconcile; import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.Keys; -import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.Account.AccountPath; -import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.AccountRole.AccountRolePath; import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.records.RoleRecord; @@ -140,37 +134,6 @@ public class Role extends TableImpl { this(DSL.name("role"), null); } - public Role(Table path, ForeignKey childPath, InverseForeignKey parentPath) { - super(path, childPath, parentPath, ROLE); - } - - /** - * A subtype implementing {@link Path} for simplified path-based joins. - */ - public static class RolePath extends Role implements Path { - public RolePath(Table path, ForeignKey childPath, InverseForeignKey parentPath) { - super(path, childPath, parentPath); - } - private RolePath(Name alias, Table aliased) { - super(alias, aliased); - } - - @Override - public RolePath as(String alias) { - return new RolePath(DSL.name(alias), this); - } - - @Override - public RolePath as(Name alias) { - return new RolePath(alias, this); - } - - @Override - public RolePath as(Table alias) { - return new RolePath(alias.getQualifiedName(), this); - } - } - @Override public Schema getSchema() { return aliased() ? null : IdmReconcile.IDM_RECONCILE; @@ -181,27 +144,6 @@ public class Role extends TableImpl { return Keys.ROLE_PKEY; } - private transient AccountRolePath _accountRole; - - /** - * Get the implicit to-many join path to the - * idm_reconcile.account_role table - */ - public AccountRolePath accountRole() { - if (_accountRole == null) - _accountRole = new AccountRolePath(this, null, Keys.ACCOUNT_ROLE__FK_ACCOUNT_ROLE_ROLE.getInverseKey()); - - return _accountRole; - } - - /** - * Get the implicit many-to-many join path to the - * idm_reconcile.account table - */ - public AccountPath account() { - return accountRole().account(); - } - @Override public Role as(String alias) { return new Role(DSL.name(alias), this); diff --git a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/idm_reconcile/tables/records/AccountBlockedRecord.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/idm_reconcile/tables/records/AccountBlockedRecord.java new file mode 100644 index 0000000..c85ef05 --- /dev/null +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/idm_reconcile/tables/records/AccountBlockedRecord.java @@ -0,0 +1,94 @@ +/* + * This file is generated by jOOQ. + */ +package ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.records; + + +import org.jooq.Record1; +import org.jooq.impl.UpdatableRecordImpl; + +import ru.micord.webbpm.ervu.business_metrics.db_beans.idm_reconcile.tables.AccountBlocked; + + +/** + * This class is generated by jOOQ. + */ +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class AccountBlockedRecord extends UpdatableRecordImpl { + + private static final long serialVersionUID = 1L; + + /** + * Setter for idm_reconcile.account_blocked.account_id. + */ + public void setAccountId(String value) { + set(0, value); + } + + /** + * Getter for idm_reconcile.account_blocked.account_id. + */ + public String getAccountId() { + return (String) get(0); + } + + /** + * Setter for idm_reconcile.account_blocked.blocked. + */ + public void setBlocked(Boolean value) { + set(1, value); + } + + /** + * Getter for idm_reconcile.account_blocked.blocked. + */ + public Boolean getBlocked() { + return (Boolean) get(1); + } + + /** + * Setter for idm_reconcile.account_blocked.id. + */ + public void setId(Long value) { + set(2, value); + } + + /** + * Getter for idm_reconcile.account_blocked.id. + */ + public Long getId() { + return (Long) get(2); + } + + // ------------------------------------------------------------------------- + // Primary key information + // ------------------------------------------------------------------------- + + @Override + public Record1 key() { + return (Record1) super.key(); + } + + // ------------------------------------------------------------------------- + // Constructors + // ------------------------------------------------------------------------- + + /** + * Create a detached AccountBlockedRecord + */ + public AccountBlockedRecord() { + super(AccountBlocked.ACCOUNT_BLOCKED); + } + + /** + * Create a detached, initialised AccountBlockedRecord + */ + public AccountBlockedRecord(String accountId, Boolean blocked, Long id) { + super(AccountBlocked.ACCOUNT_BLOCKED); + + setAccountId(accountId); + setBlocked(blocked); + setId(id); + resetChangedOnNotNull(); + } +} diff --git a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/ViewIncidentsChangeDataFromGirVu.java b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/ViewIncidentsChangeDataFromGirVu.java index f267eb0..4af1912 100644 --- a/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/ViewIncidentsChangeDataFromGirVu.java +++ b/backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/ViewIncidentsChangeDataFromGirVu.java @@ -79,6 +79,12 @@ public class ViewIncidentsChangeDataFromGirVu extends TableImpl PERCENT_SEND_TO_GIR_VU = createField(DSL.name("percent_send_to_gir_vu"), SQLDataType.NUMERIC, this, ""); + /** + * The column + * metrics.view_incidents_change_data_from_gir_vu.variance_count_send_to_gir_vu. + */ + public final TableField VARIANCE_COUNT_SEND_TO_GIR_VU = createField(DSL.name("variance_count_send_to_gir_vu"), SQLDataType.BIGINT, this, ""); + private ViewIncidentsChangeDataFromGirVu(Name alias, Table aliased) { this(alias, aliased, (Field[]) null, null); } @@ -87,9 +93,10 @@ public class ViewIncidentsChangeDataFromGirVu extends TableImplmetrics.view_incidents_change_data_from_gir_vu.variance_count_send_to_gir_vu. + */ + public void setVarianceCountSendToGirVu(Long value) { + set(5, value); + } + + /** + * Getter for + * metrics.view_incidents_change_data_from_gir_vu.variance_count_send_to_gir_vu. + */ + public Long getVarianceCountSendToGirVu() { + return (Long) get(5); + } + // ------------------------------------------------------------------------- // Constructors // ------------------------------------------------------------------------- @@ -113,7 +129,7 @@ public class ViewIncidentsChangeDataFromGirVuRecord extends TableRecordImpl private ViewPersonalInfoStat(Name alias, Table aliased, Field[] parameters, Condition where) { super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view(""" create view "view_personal_info_stat" as SELECT personal_info_stat.personal_info_stat_id, - (personal_info_stat.count_refused + personal_info_stat.count_accepted_to_send) AS count_all, - COALESCE(round((((personal_info_stat.count_refused)::numeric * (100)::numeric) / NULLIF(((personal_info_stat.count_refused + personal_info_stat.count_accepted_to_send))::numeric, (0)::numeric))), (0)::numeric) AS percent_refused, - COALESCE(round((((personal_info_stat.count_unloaded)::numeric * (100)::numeric) / NULLIF(((personal_info_stat.count_refused + personal_info_stat.count_accepted_to_send))::numeric, (0)::numeric))), (0)::numeric) AS percent_unloaded, - COALESCE(round((((personal_info_stat.count_accepted_to_send)::numeric * (100)::numeric) / NULLIF(((personal_info_stat.count_refused + personal_info_stat.count_accepted_to_send))::numeric, (0)::numeric))), (0)::numeric) AS percent_accepted_to_send + ((personal_info_stat.count_refused + personal_info_stat.count_accepted_to_send) + personal_info_stat.count_unloaded) AS count_all, + COALESCE(round((((personal_info_stat.count_refused)::numeric * (100)::numeric) / NULLIF((((personal_info_stat.count_refused + personal_info_stat.count_accepted_to_send) + personal_info_stat.count_unloaded))::numeric, (0)::numeric))), (0)::numeric) AS percent_refused, + COALESCE(round((((personal_info_stat.count_unloaded)::numeric * (100)::numeric) / NULLIF((((personal_info_stat.count_refused + personal_info_stat.count_accepted_to_send) + personal_info_stat.count_unloaded))::numeric, (0)::numeric))), (0)::numeric) AS percent_unloaded, + COALESCE(round((((personal_info_stat.count_accepted_to_send)::numeric * (100)::numeric) / NULLIF((((personal_info_stat.count_refused + personal_info_stat.count_accepted_to_send) + personal_info_stat.count_unloaded))::numeric, (0)::numeric))), (0)::numeric) AS percent_accepted_to_send FROM registration_change_address.personal_info_stat; """), where); } diff --git a/resources/src/main/resources/business-model/ervu-business-metrics/incidents.page b/resources/src/main/resources/business-model/ervu-business-metrics/incidents.page index 954d701..0a5bf0b 100644 --- a/resources/src/main/resources/business-model/ervu-business-metrics/incidents.page +++ b/resources/src/main/resources/business-model/ervu-business-metrics/incidents.page @@ -1554,7 +1554,6 @@ 0ff9d3df-e12a-4872-a635-9252ef3d14d8 ГК Первый ряд true - false false @@ -1579,7 +1578,6 @@ 450ccffd-2fbb-4df7-9643-e981d1c69428 ВК Зарегистрированные инциденты true - false false @@ -2019,36 +2017,7 @@ - - - - - aggregationColumn - - {"schema":"metrics","table":"incidents_change_data_from_gir_vu","entity":"incidents_change_data_from_gir_vu","name":"count_send_to_gir_vu"} - - - - aggregationFunction - - "SUM" - - - - backgroundColor - - "#BACEE4FF" - - - - label - - "Отправлено из ГИР ВУ" - - - - - + @@ -2073,7 +2042,7 @@ cutout - "80%" + "70%" @@ -2108,6 +2077,125 @@ + + + + + columnAggregationDataSet + + + + aggregationData + + + + + + aggregationColumn + + {"schema":"metrics","table":"incidents_change_data_from_gir_vu","entity":"incidents_change_data_from_gir_vu","name":"count_send_to_gir_vu"} + + + + aggregationFunction + + "SUM" + + + + backgroundColor + + "#BACEE4FF" + + + + label + + "Отправлено из ГИР ВУ" + + + + + + + + + + aggregationColumn + + {"schema":"metrics","table":"view_incidents_change_data_from_gir_vu","entity":"view_incidents_change_data_from_gir_vu","name":"variance_count_send_to_gir_vu"} + + + + aggregationFunction + + "SUM" + + + + backgroundColor + + "#F3F3F3FF" + + + + label + + " " + + + + + + + + + dataLabel + + "Зарегистрировано, в т.ч.:" + + + + + + + cutout + + "60%" + + + + datasetType + + "COLUMN_AGGREGATION" + + + + loadDao + + + + graph + + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"incidents_change_data_from_gir_vu","schemaName":"metrics","x":470.0,"y":162.0,"alias":"incidents_change_data_from_gir_vu","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"1":{"tableName":"recruitment","schemaName":"metrics","x":182.0,"y":234.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"2":{"tableName":"view_incidents_change_data_from_gir_vu","schemaName":"metrics","x":681.0,"y":228.0,"alias":"view_incidents_change_data_from_gir_vu","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"incidents_change_data_from_gir_vu","schemaName":"metrics","x":470.0,"y":162.0,"alias":"incidents_change_data_from_gir_vu","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"recruitment","schemaName":"metrics","x":182.0,"y":234.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"view_incidents_change_data_from_gir_vu","schemaName":"metrics","x":681.0,"y":228.0,"alias":"view_incidents_change_data_from_gir_vu","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"recruitment":{"tableName":"recruitment","schemaName":"metrics","x":182.0,"y":234.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"incidents_change_data_from_gir_vu":{"tableName":"incidents_change_data_from_gir_vu","schemaName":"metrics","x":470.0,"y":162.0,"alias":"incidents_change_data_from_gir_vu","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"view_incidents_change_data_from_gir_vu":{"tableName":"view_incidents_change_data_from_gir_vu","schemaName":"metrics","x":681.0,"y":228.0,"alias":"view_incidents_change_data_from_gir_vu","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null,{"refOnEntityName":"incidents_change_data_from_gir_vu","refToEntityName":"recruitment","refToColumns":[{"schema":"metrics","table":"recruitment","entity":"recruitment","name":"idm_id"}],"refOnColumns":[{"schema":"metrics","table":"incidents_change_data_from_gir_vu","entity":"incidents_change_data_from_gir_vu","name":"recruitment_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},null],[null,null,null],[{"refOnEntityName":"view_incidents_change_data_from_gir_vu","refToEntityName":"incidents_change_data_from_gir_vu","refToColumns":[{"schema":"metrics","table":"incidents_change_data_from_gir_vu","entity":"incidents_change_data_from_gir_vu","name":"incidents_change_data_from_gir_vu_id"}],"refOnColumns":[{"schema":"metrics","table":"view_incidents_change_data_from_gir_vu","entity":"view_incidents_change_data_from_gir_vu","name":"incidents_change_data_from_gir_vu_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},null,null]],"mainNodeIndex":0} + + + + +DefaultLoadDao +database.dao + + + + + radius + + "70%" + + + + + @@ -2130,6 +2218,7 @@ ervu_business_metrics.component.chart true + true cssClasses @@ -3204,6 +3293,7 @@ 8c048d37-2167-4bfd-86b1-1e5ac6f71e2a ВК инцидентов принято на рассмотрение true + false false @@ -3515,7 +3605,6 @@ 8522fcd7-8bd4-4750-97c2-a793048a220a ГК Второй ряд true - false false @@ -4941,6 +5030,7 @@ c90ef4f7-eb92-4035-a078-efe64e573db7 ВК Закрытые инциденты true + false false @@ -7234,6 +7324,7 @@ 9ded84c5-ed67-41f7-b562-522b524a899c ГК Третий ряд true + false false