treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PlannerAllToday и planner_all_today изменились названия полей source -> parent, origId -> parentId. Затронуло SchedulerAllTodayBackendGetAll, PlannerAllTodayMapStore, PlannerAllToday.

Browse source
This commit is contained in:
psemenkov 2022-12-07 11:55:06 +03:00
parent 5ee3129316
commit 04905c4e0a
3 changed files with 29 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/SchedulerAllTodayBackendGetAll.java
View file

@ -17,18 +17,6 @@ public class SchedulerAllTodayBackendGetAll extends BasicSpcexResponse {
@ApiModelProperty(value = "Полезная нагрузка") @ApiModelProperty(value = "Полезная нагрузка")
private SchedulerAllTodayBackendPayload payload = new SchedulerAllTodayBackendPayload(); private SchedulerAllTodayBackendPayload payload = new SchedulerAllTodayBackendPayload();
private static class SchedulerAllTodayBackendPayload {
private List<SchedulerAllTodayBackendGetFields> items = new ArrayList<>();
public List<SchedulerAllTodayBackendGetFields> getItems() {
return items;
}
public void setItems(List<SchedulerAllTodayBackendGetFields> items) {
this.items = items;
}
}
public SchedulerAllTodayBackendPayload getPayload() { public SchedulerAllTodayBackendPayload getPayload() {
return payload; return payload;
} }
@ -48,10 +36,22 @@ public class SchedulerAllTodayBackendGetAll extends BasicSpcexResponse {
singleItem.setMarket(schedulerAllToday.getMarket()); singleItem.setMarket(schedulerAllToday.getMarket());
singleItem.setTaskStatus(schedulerAllToday.getTaskStatus()); singleItem.setTaskStatus(schedulerAllToday.getTaskStatus());
singleItem.setSecurityId(schedulerAllToday.getSecurityId()); singleItem.setSecurityId(schedulerAllToday.getSecurityId());
singleItem.setSource(schedulerAllToday.getSource()); singleItem.setSource(schedulerAllToday.getParent());
singleItem.setOrigId(schedulerAllToday.getOrigId()); singleItem.setOrigId(schedulerAllToday.getParentId());
payload.getItems().add(singleItem); payload.getItems().add(singleItem);
} }
} }
private static class SchedulerAllTodayBackendPayload {
private List<SchedulerAllTodayBackendGetFields> items = new ArrayList<>();
public List<SchedulerAllTodayBackendGetFields> getItems() {
return items;
}
public void setItems(List<SchedulerAllTodayBackendGetFields> items) {
this.items = items;
}
}
} }

20
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/PlannerAllToday.java
View file

@ -20,8 +20,8 @@ public class PlannerAllToday extends SpcexObjectBase {
private String market; private String market;
private String taskStatus; private String taskStatus;
private Long securityId; private Long securityId;
private String source; private String parent;
private Long origId; private Long parentId;
public String getTask() { public String getTask() {
return task; return task;
@ -71,20 +71,20 @@ public class PlannerAllToday extends SpcexObjectBase {
this.securityId = value; this.securityId = value;
} }
public String getSource() { public String getParent() {
return source; return parent;
} }
public void setSource(String value) { public void setParent(String value) {
this.source = value; this.parent = value;
} }
public Long getOrigId() { public Long getParentId() {
return origId; return parentId;
} }
public void setOrigId(Long value) { public void setParentId(Long value) {
this.origId = value; this.parentId = value;
} }
} }

10
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/PlannerAllTodayMapStore.java
View file

@ -30,7 +30,7 @@ public class PlannerAllTodayMapStore extends TemplateMapStore<PlannerAllToday> {
@Override @Override
public String[] getFields() { public String[] getFields() {
return new String[]{ 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<PlannerAllToday> {
object.setMarket(resultSet.getObject("MARKET", String.class)); object.setMarket(resultSet.getObject("MARKET", String.class));
object.setTaskStatus(resultSet.getObject("TASK_STATUS", String.class)); object.setTaskStatus(resultSet.getObject("TASK_STATUS", String.class));
object.setSecurityId(resultSet.getObject("SECURITY_ID", Long.class)); object.setSecurityId(resultSet.getObject("SECURITY_ID", Long.class));
object.setSource(resultSet.getObject("SOURCE", String.class)); object.setParent(resultSet.getObject("PARENT", String.class));
object.setOrigId(resultSet.getObject("ORIG_ID", Long.class)); object.setParentId(resultSet.getObject("PARENT_ID", Long.class));
return object; return object;
} }
@ -59,8 +59,8 @@ public class PlannerAllTodayMapStore extends TemplateMapStore<PlannerAllToday> {
object.getMarket(), object.getMarket(),
object.getTaskStatus(), object.getTaskStatus(),
object.getSecurityId(), object.getSecurityId(),
object.getSource(), object.getParent(),
object.getOrigId() object.getParentId()
}; };
return args; return args;
} }