From 9b0acaeb7a8be93fe2168aa855ad8126122d6427 Mon Sep 17 00:00:00 2001 From: ialbert Date: Thu, 22 Dec 2022 11:44:56 +0300 Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-198 --- .../schedule/PlannerTemplateNewAction.java | 24 ++++++++++++++ .../schedule/PlannerTemplateUpdateAction.java | 24 ++++++++++++++ .../data/scheduler/PlannerTemplate.java | 17 ++++++++++ .../statics/data/user/UserConnect.java | 20 ++++++------ .../dictionary/InterestStatusDictionary.java | 12 ------- .../UserConnectHistoryMapStore.java | 6 ++-- .../PlannerTemplateMapStore.java | 8 +++-- .../businessobject/UserConnectMapStore.java | 10 +++--- .../InterestStatusDictionaryMapStore.java | 31 ------------------- .../service/PlannerTemplateService.java | 4 +++ .../clearing/utility/service/UserService.java | 4 +-- .../clearing/imdg/IMDGDistributedNames.java | 1 - .../schedule/PlannerTemplateNewRequest.java | 20 ++++++++++++ .../PlannerTemplateUpdateRequest.java | 20 ++++++++++++ 14 files changed, 135 insertions(+), 66 deletions(-) delete mode 100644 clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/InterestStatusDictionary.java delete mode 100644 clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/InterestStatusDictionaryMapStore.java diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/PlannerTemplateNewAction.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/PlannerTemplateNewAction.java index 2beafb2ed..6ab3eb845 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/PlannerTemplateNewAction.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/PlannerTemplateNewAction.java @@ -30,6 +30,12 @@ public class PlannerTemplateNewAction implements IAction - * Dictionary DB table: INTEREST_STATUS_DICTIONARY - **/ -public class InterestStatusDictionary extends AbstractDictionary { - private static final long serialVersionUID = ConstDictionarySerializable.serialVersionUID; - - -} \ No newline at end of file diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/UserConnectHistoryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/UserConnectHistoryMapStore.java index 4f0bbab9e..e2f79fd69 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/UserConnectHistoryMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessevent/UserConnectHistoryMapStore.java @@ -28,7 +28,7 @@ public class UserConnectHistoryMapStore extends TemplateEventMapStore { @Override public String[] getFields() { return new String[]{ - "ID", "CREATED_AT", "UPDATED_AT", "TASK", "TASK_TIME", "TASK_STATUS" + "ID", "CREATED_AT", "UPDATED_AT", "TASK", "TASK_TIME", "TASK_STATUS", "COMPANY_ID", "SECURITY_ID" }; } @@ -43,6 +43,8 @@ public class PlannerTemplateMapStore extends TemplateMapStore { object.setTask(resultSet.getObject("TASK", String.class)); object.setTaskTime(getLocalTimeFromSqlTime(resultSet, "TASK_TIME")); object.setTaskStatus(resultSet.getObject("TASK_STATUS", String.class)); + object.setCompanyId(resultSet.getObject("COMPANY_ID", Long.class)); + object.setSecurityId(resultSet.getObject("SECURITY_ID", Long.class)); return object; } @@ -54,7 +56,9 @@ public class PlannerTemplateMapStore extends TemplateMapStore { TimeUtil.toDateFromInstant(object.getUpdated()), object.getTask(), TimeUtil.toDateFromLocalTime(object.getTaskTime()), - object.getTaskStatus() + object.getTaskStatus(), + object.getCompanyId(), + object.getSecurityId() }; return args; } diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/UserConnectMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/UserConnectMapStore.java index fe5f61fab..60e6267f1 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/UserConnectMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/UserConnectMapStore.java @@ -30,7 +30,7 @@ public class UserConnectMapStore extends TemplateMapStore { @Override public String[] getFields() { return new String[]{ - "ID", "CREATED_AT", "UPDATED_AT", "USER_ID", "CONNECTION_TIME", "DISCONNECTION_TIME", "SERVER_I_P", "CLIENT_I_P", "CONNECTION_STATE", "CLEARING_DATE", "ERROR_CODE", "ERROR_TEXT" + "ID", "CREATED_AT", "UPDATED_AT", "USER_ID", "CONNECTION_TIME", "DISCONNECTION_TIME", "SERVER_IP", "CLIENT_IP", "CONNECTION_STATE", "CLEARING_DATE", "ERROR_CODE", "ERROR_TEXT" }; } @@ -43,8 +43,8 @@ public class UserConnectMapStore extends TemplateMapStore { object.setUserId(resultSet.getObject("USER_ID", Long.class)); object.setConnectionTime(getInstantFromTimestamp(resultSet, "CONNECTION_TIME")); object.setDisconnectionTime(getInstantFromTimestamp(resultSet, "DISCONNECTION_TIME")); - object.setServerIP(resultSet.getObject("SERVER_I_P", String.class)); - object.setClientIP(resultSet.getObject("CLIENT_I_P", String.class)); + object.setServerIp(resultSet.getObject("SERVER_IP", String.class)); + object.setClientIp(resultSet.getObject("CLIENT_IP", String.class)); object.setConnectionState(resultSet.getObject("CONNECTION_STATE", String.class)); object.setClearingDate(getLocalDateFromSqlDate(resultSet, "CLEARING_DATE")); object.setErrorCode(resultSet.getObject("ERROR_CODE", Long.class)); @@ -61,8 +61,8 @@ public class UserConnectMapStore extends TemplateMapStore { object.getUserId(), TimeUtil.toDateFromInstant(object.getConnectionTime()), TimeUtil.toDateFromInstant(object.getDisconnectionTime()), - object.getServerIP(), - object.getClientIP(), + object.getServerIp(), + object.getClientIp(), object.getConnectionState(), TimeUtil.toDateFromLocalDate(object.getClearingDate()), object.getErrorCode(), diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/InterestStatusDictionaryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/InterestStatusDictionaryMapStore.java deleted file mode 100644 index af6609e62..000000000 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/InterestStatusDictionaryMapStore.java +++ /dev/null @@ -1,31 +0,0 @@ -package ru.spcex.clearing.imdg.dictionary; - -import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.stereotype.Component; -import ru.clearing.platform.dictionary.InterestStatusDictionary; -import ru.spcex.clearing.imdg.IMDGDistributedNames; -import ru.spcex.clearing.imdg.base.DictionaryTMapStore; - -@Component -public class InterestStatusDictionaryMapStore extends DictionaryTMapStore { - - public InterestStatusDictionaryMapStore(JdbcTemplate jdbcTemplate) { - super(jdbcTemplate); - } - - @Override - public String getMapName() { - return IMDGDistributedNames.Map_InterestStatusDictionary; - } - - @Override - public String getTableName() { - return "INTEREST_STATUS_DICTIONARY"; - } - - @Override - public InterestStatusDictionary getDictionaryObject() { - return new InterestStatusDictionary(); - } - -} \ No newline at end of file diff --git a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/PlannerTemplateService.java b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/PlannerTemplateService.java index 0fceaa2d4..e39a6e48c 100644 --- a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/PlannerTemplateService.java +++ b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/PlannerTemplateService.java @@ -51,6 +51,8 @@ public class PlannerTemplateService extends QueueConsumer implements Initializin plannerTemplate.setTask(req.getTask()); plannerTemplate.setTaskTime(req.getTaskTime()); plannerTemplate.setTaskStatus(req.getTaskStatus()); + plannerTemplate.setCompanyId(req.getCompanyId()); + plannerTemplate.setSecurityId(req.getSecurityId()); plannerTemplateMap.insert(plannerTemplate); log.debug("successfully processed, new id {}", plannerTemplate.getId()); } @@ -62,6 +64,8 @@ public class PlannerTemplateService extends QueueConsumer implements Initializin plannerTemplate.setTask(req.getTask()); plannerTemplate.setTaskTime(req.getTaskTime()); plannerTemplate.setTaskStatus(req.getTaskStatus()); + plannerTemplate.setCompanyId(req.getCompanyId()); + plannerTemplate.setSecurityId(req.getSecurityId()); plannerTemplateMap.update(plannerTemplate); log.debug("successfully processed, new id {}", plannerTemplate.getId()); } diff --git a/clearing-parent/utility-service/src/main/java/ru/spcex/clearing/utility/service/UserService.java b/clearing-parent/utility-service/src/main/java/ru/spcex/clearing/utility/service/UserService.java index 6856fe3d7..7490e5b30 100644 --- a/clearing-parent/utility-service/src/main/java/ru/spcex/clearing/utility/service/UserService.java +++ b/clearing-parent/utility-service/src/main/java/ru/spcex/clearing/utility/service/UserService.java @@ -184,8 +184,8 @@ public class UserService extends QueueConsumer implements InitializingBean { userConnect.setUpdated(time); } userConnect.setConnectionTime(time); - userConnect.setServerIP(serverIp); - userConnect.setClientIP(clientIp); + userConnect.setServerIp(serverIp); + userConnect.setClientIp(clientIp); userConnect.setConnectionState(ConnectionState.Connected.getKey()); userConnect.setClearingDate(LocalDate.now()); if (isNew) { diff --git a/platform-parent/platform-imdg-api/src/main/java/ru/spcex/clearing/imdg/IMDGDistributedNames.java b/platform-parent/platform-imdg-api/src/main/java/ru/spcex/clearing/imdg/IMDGDistributedNames.java index 5d5225e73..0b9a7a970 100644 --- a/platform-parent/platform-imdg-api/src/main/java/ru/spcex/clearing/imdg/IMDGDistributedNames.java +++ b/platform-parent/platform-imdg-api/src/main/java/ru/spcex/clearing/imdg/IMDGDistributedNames.java @@ -58,7 +58,6 @@ public final class IMDGDistributedNames { public static final String Map_SDf09 = "Map_SDf09"; public static final String Map_SDf12 = "Map_SDf12"; public static final String Map_SDf18 = "Map_SDf18"; - public static final String Map_InterestStatusDictionary = "Map_InterestStatusDictionary"; public static final String Map_AllowedDictionary = "Map_AllowedDictionary"; public static final String Map_ClearingCategoryDictionary = "Map_ClearingMemberCategoryDictionary"; public static final String Map_CompanyRoleDictionary = "Map_CompanyRoleDictionary"; diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/PlannerTemplateNewRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/PlannerTemplateNewRequest.java index 7bafd0953..4705b5c4d 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/PlannerTemplateNewRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/PlannerTemplateNewRequest.java @@ -18,6 +18,10 @@ public class PlannerTemplateNewRequest { public LocalTime taskTime; @JsonProperty public String taskStatus; + @JsonProperty + public Long companyId; + @JsonProperty + public Long securityId; public String getTask() { return task; @@ -42,4 +46,20 @@ public class PlannerTemplateNewRequest { public void setTaskStatus(String taskStatus) { this.taskStatus = taskStatus; } + + public Long getCompanyId() { + return companyId; + } + + public void setCompanyId(Long companyId) { + this.companyId = companyId; + } + + public Long getSecurityId() { + return securityId; + } + + public void setSecurityId(Long securityId) { + this.securityId = securityId; + } } diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/PlannerTemplateUpdateRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/PlannerTemplateUpdateRequest.java index 6f1748334..0c22d6520 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/PlannerTemplateUpdateRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/PlannerTemplateUpdateRequest.java @@ -21,6 +21,10 @@ public class PlannerTemplateUpdateRequest { public LocalTime taskTime; @JsonProperty public String taskStatus; + @JsonProperty + public Long companyId; + @JsonProperty + public Long securityId; public String getTask() { return task; @@ -53,4 +57,20 @@ public class PlannerTemplateUpdateRequest { public void setId(Long id) { this.id = id; } + + public Long getCompanyId() { + return companyId; + } + + public void setCompanyId(Long companyId) { + this.companyId = companyId; + } + + public Long getSecurityId() { + return securityId; + } + + public void setSecurityId(Long securityId) { + this.securityId = securityId; + } }