diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/security/handlers/AuthAuditSuccessLoginHandler.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/security/handlers/AuthAuditSuccessLoginHandler.java index a1b0313d2..6d39e9cbb 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/security/handlers/AuthAuditSuccessLoginHandler.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/security/handlers/AuthAuditSuccessLoginHandler.java @@ -40,7 +40,7 @@ public class AuthAuditSuccessLoginHandler implements AuthenticationSuccessHandle .getPreferredUsername(); Set roles = details.getRoles(); - if (roles.contains(Admin) || roles.contains(Security) || roles.contains(Superviser)) { + if (roles.contains(Admin.getKey()) || roles.contains(Security.getKey()) || roles.contains(Superviser.getKey())) { String clientIp = request != null ? request.getRemoteAddr() : null; String serverIp = request != null ? request.getLocalAddr() : null; userAutoCreation.sendAuthSuccessEvent(username, roles, clientIp, serverIp); diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/AdmittedDealRegister.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/AdmittedDealRegister.java index e2bb3eb72..859eef78f 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/AdmittedDealRegister.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/AdmittedDealRegister.java @@ -8,9 +8,9 @@ import java.time.Instant; import java.time.LocalTime; /** - * Счета + * Реестр сделок допущенных к клирингу *

- * DB table: ADMITTED_DEAL + * DB table: ADMITTED_DEAL_REGISTER **/ public class AdmittedDealRegister extends BusinessObject { private static final long serialVersionUID = ConstSerializable.serialVersionUID; diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/ClearingCalendar.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/ClearingCalendar.java index 85803a39b..0e74c8314 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/ClearingCalendar.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/ClearingCalendar.java @@ -8,7 +8,7 @@ import java.time.LocalDate; /** * Торговые и неторговые дни *

- * DB table: TRADING_CALENDAR + * DB table: CLEARING_CALENDAR **/ public class ClearingCalendar extends BusinessObject { private static final long serialVersionUID = ConstSerializable.serialVersionUID; diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/Launcher.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/Launcher.java index 9fa2e37e4..987ee2f5b 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/Launcher.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/Launcher.java @@ -6,7 +6,7 @@ import ru.clearing.classes.objects.BusinessObject; /** * Запуск задачи *

- * DB table: TASK_RUNNER + * DB table: LAUNCHER **/ public class Launcher extends BusinessObject { private static final long serialVersionUID = ConstSerializable.serialVersionUID; diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/Planner.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/Planner.java index c29e8ba80..a4125225c 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/Planner.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/Planner.java @@ -7,9 +7,9 @@ import java.time.LocalDate; import java.time.LocalTime; /** - * Расписание планировщика + * Расписание *

- * DB table: SCHEDULER + * DB table: PLANNER **/ public class Planner extends BusinessObject { private static final long serialVersionUID = ConstSerializable.serialVersionUID;