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

http://jira.mfd.msk:8088/browse/CLS-198

Browse source
This commit is contained in:
ialbert 2022-12-22 15:04:39 +03:00
parent edbe6b928b
commit 64d889566d
7 changed files with 52 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/PlannerNewAction.java
View file

@ -46,6 +46,10 @@ public class PlannerNewAction implements IAction<PlannerNewRequest> {
@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> {
plannerNewRequest.setClearingDate(clearingDate);
plannerNewRequest.setMarket(market);
plannerNewRequest.setTaskStatus(taskStatus);
plannerNewRequest.setCompanyId(companyId);
plannerNewRequest.setSecurityId(securityId);
return plannerNewRequest;
}

13
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/PlannerUpdateAction.java
View file

@ -51,6 +51,10 @@ public class PlannerUpdateAction implements IAction<PlannerUpdateRequest>, 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<PlannerUpdateRequest>, 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<PlannerUpdateRequest>, WithI
public void setSecurityId(Long securityId) {
this.securityId = securityId;
}
public Long getCompanyId() {
return companyId;
}
public void setCompanyId(Long companyId) {
this.companyId = companyId;
}
}

8
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/Planner.java
View file

@ -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;
}
}

4
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/PlannerMapStore.java
View file

@ -30,7 +30,7 @@ public class PlannerMapStore extends TemplateMapStore<Planner> {
@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<Planner> {
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<Planner> {
TimeUtil.toDateFromLocalDate(object.getClearingDate()),
object.getMarket(),
object.getTaskStatus(),
object.getCompanyId(),
object.getSecurityId()
};
return args;

2
clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/PlannerService.java
View file

@ -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);
}

11
platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/PlannerNewRequest.java
View file

@ -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;
}
}

10
platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/PlannerUpdateRequest.java
View file

@ -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;
}
}