From 64d889566db6d744e13e5239b8a9fcf1f9d39a1a Mon Sep 17 00:00:00 2001 From: ialbert Date: Thu, 22 Dec 2022 15:04:39 +0300 Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-198 --- .../request/cud/schedule/PlannerNewAction.java | 5 +++++ .../request/cud/schedule/PlannerUpdateAction.java | 13 +++++++++++++ .../classes/statics/data/scheduler/Planner.java | 8 ++++++++ .../imdg/businessobject/PlannerMapStore.java | 4 +++- .../clearing/scheduler/service/PlannerService.java | 2 ++ .../domain/cud/schedule/PlannerNewRequest.java | 11 +++++++++++ .../domain/cud/schedule/PlannerUpdateRequest.java | 10 ++++++++++ 7 files changed, 52 insertions(+), 1 deletion(-) diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/PlannerNewAction.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/PlannerNewAction.java index 15e97b017..6bba90535 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/PlannerNewAction.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/PlannerNewAction.java @@ -46,6 +46,10 @@ public class PlannerNewAction implements IAction { @JsonProperty public String taskStatus; + @ApiModelProperty(value = "Компания", example = "1000") + @JsonProperty + public Long companyId; + @ApiModelProperty(value = "Инструмент", example = "1000") @JsonProperty public Long securityId; @@ -58,6 +62,7 @@ public class PlannerNewAction implements IAction { plannerNewRequest.setClearingDate(clearingDate); plannerNewRequest.setMarket(market); plannerNewRequest.setTaskStatus(taskStatus); + plannerNewRequest.setCompanyId(companyId); plannerNewRequest.setSecurityId(securityId); return plannerNewRequest; } diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/PlannerUpdateAction.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/PlannerUpdateAction.java index da30c5a02..6c4de9a31 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/PlannerUpdateAction.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/PlannerUpdateAction.java @@ -51,6 +51,10 @@ public class PlannerUpdateAction implements IAction, WithI @JsonProperty public String taskStatus; + @ApiModelProperty(value = "Компания", example = "1000") + @JsonProperty + public Long companyId; + @ApiModelProperty(value = "Инструмент", example = "1000") @JsonProperty public Long securityId; @@ -64,6 +68,7 @@ public class PlannerUpdateAction implements IAction, WithI plannerUpdateRequest.setClearingDate(clearingDate); plannerUpdateRequest.setMarket(market); plannerUpdateRequest.setTaskStatus(taskStatus); + plannerUpdateRequest.setCompanyId(companyId); plannerUpdateRequest.setSecurityId(securityId); return plannerUpdateRequest; } @@ -151,4 +156,12 @@ public class PlannerUpdateAction implements IAction, WithI public void setSecurityId(Long securityId) { this.securityId = securityId; } + + public Long getCompanyId() { + return companyId; + } + + public void setCompanyId(Long companyId) { + this.companyId = companyId; + } } 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 a4125225c..d29b579d0 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 @@ -19,6 +19,7 @@ public class Planner extends BusinessObject { private LocalDate clearingDate; private String market; private String taskStatus; + private Long companyId; private Long securityId; @@ -70,4 +71,11 @@ public class Planner extends BusinessObject { this.securityId = value; } + public Long getCompanyId() { + return companyId; + } + + public void setCompanyId(Long companyId) { + this.companyId = companyId; + } } diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/PlannerMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/PlannerMapStore.java index 1de186ecd..e4d8e01b0 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/PlannerMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/PlannerMapStore.java @@ -30,7 +30,7 @@ public class PlannerMapStore extends TemplateMapStore { @Override public String[] getFields() { return new String[]{ - "ID", "CREATED_AT", "UPDATED_AT", "TASK", "TASK_TIME", "CLEARING_DATE", "MARKET", "TASK_STATUS", "SECURITY_ID" + "ID", "CREATED_AT", "UPDATED_AT", "TASK", "TASK_TIME", "CLEARING_DATE", "MARKET", "TASK_STATUS", "COMPANY_ID", "SECURITY_ID" }; } @@ -45,6 +45,7 @@ public class PlannerMapStore extends TemplateMapStore { object.setClearingDate(getLocalDateFromSqlDate(resultSet, "CLEARING_DATE")); object.setMarket(resultSet.getObject("MARKET", String.class)); 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; } @@ -60,6 +61,7 @@ public class PlannerMapStore extends TemplateMapStore { TimeUtil.toDateFromLocalDate(object.getClearingDate()), object.getMarket(), object.getTaskStatus(), + object.getCompanyId(), object.getSecurityId() }; return args; diff --git a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/PlannerService.java b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/PlannerService.java index dcef9b26e..79361ca59 100644 --- a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/PlannerService.java +++ b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/PlannerService.java @@ -53,6 +53,7 @@ public class PlannerService extends QueueConsumer implements InitializingBean { planner.setClearingDate(req.getClearingDate()); planner.setMarket(req.getMarket()); planner.setTaskStatus(req.getTaskStatus()); + planner.setCompanyId(req.getCompanyId()); planner.setSecurityId(req.getSecurityId()); plannerMap.insert(planner); log.debug("successfully processed, new id {}", planner.getId()); @@ -67,6 +68,7 @@ public class PlannerService extends QueueConsumer implements InitializingBean { planner.setClearingDate(req.getClearingDate()); planner.setMarket(req.getMarket()); planner.setTaskStatus(req.getTaskStatus()); + planner.setCompanyId(req.getCompanyId()); planner.setSecurityId(req.getSecurityId()); plannerMap.update(planner); } diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/PlannerNewRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/PlannerNewRequest.java index c26568aab..104469fbc 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/PlannerNewRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/PlannerNewRequest.java @@ -32,6 +32,9 @@ public class PlannerNewRequest { @JsonProperty public String taskStatus; + @JsonProperty + public Long companyId; + @JsonProperty public Long securityId; @@ -82,4 +85,12 @@ public class PlannerNewRequest { public void setSecurityId(Long securityId) { this.securityId = securityId; } + + public Long getCompanyId() { + return companyId; + } + + public void setCompanyId(Long companyId) { + this.companyId = companyId; + } } diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/PlannerUpdateRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/PlannerUpdateRequest.java index cfe58c797..3c186a7a5 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/PlannerUpdateRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/PlannerUpdateRequest.java @@ -30,6 +30,8 @@ public class PlannerUpdateRequest { @JsonProperty public String taskStatus; @JsonProperty + public Long companyId; + @JsonProperty public Long securityId; public Long getId() { @@ -87,4 +89,12 @@ public class PlannerUpdateRequest { public void setSecurityId(Long securityId) { this.securityId = securityId; } + + public Long getCompanyId() { + return companyId; + } + + public void setCompanyId(Long companyId) { + this.companyId = companyId; + } }