From 04905c4e0a80e260d565989ee393b0e415025ed4 Mon Sep 17 00:00:00 2001 From: psemenkov Date: Wed, 7 Dec 2022 11:55:06 +0300 Subject: [PATCH] =?UTF-8?q?PlannerAllToday=20=D0=B8=20planner=5Fall=5Ftoda?= =?UTF-8?q?y=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB=D0=B8=D1=81?= =?UTF-8?q?=D1=8C=20=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20?= =?UTF-8?q?=D0=BF=D0=BE=D0=BB=D0=B5=D0=B9=20source=20->=20parent,=20origId?= =?UTF-8?q?=20->=20parentId.=20=D0=97=D0=B0=D1=82=D1=80=D0=BE=D0=BD=D1=83?= =?UTF-8?q?=D0=BB=D0=BE=20SchedulerAllTodayBackendGetAll,=20PlannerAllToda?= =?UTF-8?q?yMapStore,=20PlannerAllToday.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SchedulerAllTodayBackendGetAll.java | 28 +++++++++---------- .../data/scheduler/PlannerAllToday.java | 20 ++++++------- .../imdg/object/PlannerAllTodayMapStore.java | 10 +++---- 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/SchedulerAllTodayBackendGetAll.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/SchedulerAllTodayBackendGetAll.java index 63561c6e4..f2e8ce7c6 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/SchedulerAllTodayBackendGetAll.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/SchedulerAllTodayBackendGetAll.java @@ -17,18 +17,6 @@ public class SchedulerAllTodayBackendGetAll extends BasicSpcexResponse { @ApiModelProperty(value = "Полезная нагрузка") private SchedulerAllTodayBackendPayload payload = new SchedulerAllTodayBackendPayload(); - private static class SchedulerAllTodayBackendPayload { - private List items = new ArrayList<>(); - - public List getItems() { - return items; - } - - public void setItems(List items) { - this.items = items; - } - } - public SchedulerAllTodayBackendPayload getPayload() { return payload; } @@ -48,10 +36,22 @@ public class SchedulerAllTodayBackendGetAll extends BasicSpcexResponse { singleItem.setMarket(schedulerAllToday.getMarket()); singleItem.setTaskStatus(schedulerAllToday.getTaskStatus()); singleItem.setSecurityId(schedulerAllToday.getSecurityId()); - singleItem.setSource(schedulerAllToday.getSource()); - singleItem.setOrigId(schedulerAllToday.getOrigId()); + singleItem.setSource(schedulerAllToday.getParent()); + singleItem.setOrigId(schedulerAllToday.getParentId()); payload.getItems().add(singleItem); } } + private static class SchedulerAllTodayBackendPayload { + private List items = new ArrayList<>(); + + public List getItems() { + return items; + } + + public void setItems(List items) { + this.items = items; + } + } + } \ No newline at end of file diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/PlannerAllToday.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/PlannerAllToday.java index 9850ef734..5c75befcc 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/PlannerAllToday.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/PlannerAllToday.java @@ -20,8 +20,8 @@ public class PlannerAllToday extends SpcexObjectBase { private String market; private String taskStatus; private Long securityId; - private String source; - private Long origId; + private String parent; + private Long parentId; public String getTask() { return task; @@ -71,20 +71,20 @@ public class PlannerAllToday extends SpcexObjectBase { this.securityId = value; } - public String getSource() { - return source; + public String getParent() { + return parent; } - public void setSource(String value) { - this.source = value; + public void setParent(String value) { + this.parent = value; } - public Long getOrigId() { - return origId; + public Long getParentId() { + return parentId; } - public void setOrigId(Long value) { - this.origId = value; + public void setParentId(Long value) { + this.parentId = value; } } \ No newline at end of file diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/PlannerAllTodayMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/PlannerAllTodayMapStore.java index acd395527..0c83e9a05 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/PlannerAllTodayMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/PlannerAllTodayMapStore.java @@ -30,7 +30,7 @@ public class PlannerAllTodayMapStore extends TemplateMapStore { @Override public String[] getFields() { return new String[]{ - "ID", "TASK", "TASK_TIME", "CLEARING_DATE", "MARKET", "TASK_STATUS", "SECURITY_ID", "SOURCE", "ORIG_ID" + "ID", "TASK", "TASK_TIME", "CLEARING_DATE", "MARKET", "TASK_STATUS", "SECURITY_ID", "PARENT", "PARENT_ID" }; } @@ -44,8 +44,8 @@ public class PlannerAllTodayMapStore extends TemplateMapStore { object.setMarket(resultSet.getObject("MARKET", String.class)); object.setTaskStatus(resultSet.getObject("TASK_STATUS", String.class)); object.setSecurityId(resultSet.getObject("SECURITY_ID", Long.class)); - object.setSource(resultSet.getObject("SOURCE", String.class)); - object.setOrigId(resultSet.getObject("ORIG_ID", Long.class)); + object.setParent(resultSet.getObject("PARENT", String.class)); + object.setParentId(resultSet.getObject("PARENT_ID", Long.class)); return object; } @@ -59,8 +59,8 @@ public class PlannerAllTodayMapStore extends TemplateMapStore { object.getMarket(), object.getTaskStatus(), object.getSecurityId(), - object.getSource(), - object.getOrigId() + object.getParent(), + object.getParentId() }; return args; }