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

rename feald TradingStatus -> DayStatus for ClearingCalendar and other entities

Browse source
This commit is contained in:
psemenkov 2022-12-06 17:36:17 +03:00
parent 08dd60e18e
commit c1e66ed914
7 changed files with 37 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -17,18 +17,6 @@ public class ClearingCalendarBackendGetAll extends BasicSpcexResponse {
@ApiModelProperty(value = "Полезная нагрузка")
private ClearingCalendarBackendPayload payload = new ClearingCalendarBackendPayload();
private static class ClearingCalendarBackendPayload {
private List<TradingCalendarBackendGetFields> items = new ArrayList<>();
public List<TradingCalendarBackendGetFields> getItems() {
return items;
}
public void setItems(List<TradingCalendarBackendGetFields> items) {
this.items = items;
}
}
public ClearingCalendarBackendPayload getPayload() {
return payload;
}
@ -44,11 +32,22 @@ public class ClearingCalendarBackendGetAll extends BasicSpcexResponse {
singleItem.setId(tradingCalendar.getId());
singleItem.setClearingDate(tradingCalendar.getClearingDate());
singleItem.setCompanyId(tradingCalendar.getCompanyId());
singleItem.setTradingStatus(tradingCalendar.getTradingStatus());
singleItem.setDayStatus(tradingCalendar.getDayStatus());
singleItem.setCreated(tradingCalendar.getCreated());
singleItem.setUpdated(tradingCalendar.getUpdated());
payload.getItems().add(singleItem);
}
}
private static class ClearingCalendarBackendPayload {
private List<TradingCalendarBackendGetFields> items = new ArrayList<>();
public List<TradingCalendarBackendGetFields> getItems() {
return items;
}
public void setItems(List<TradingCalendarBackendGetFields> items) {
this.items = items;
}
}
}

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

@ -17,7 +17,7 @@ public class TradingCalendarBackendGetFields {
@JsonProperty
private Long companyId;
@JsonProperty
private String tradingStatus;
private String dayStatus;
@JsonProperty
@JsonSerialize(using = InstantSerializer.class)
private Instant created;
@ -49,12 +49,12 @@ public class TradingCalendarBackendGetFields {
this.companyId = companyId;
}
public String getTradingStatus() {
return tradingStatus;
public String getDayStatus() {
return dayStatus;
}
public void setTradingStatus(String tradingStatus) {
this.tradingStatus = tradingStatus;
public void setDayStatus(String dayStatus) {
this.dayStatus = dayStatus;
}
public Instant getCreated() {

10
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/ClearingCalendar.java
View file

@ -15,7 +15,7 @@ public class ClearingCalendar extends BusinessObject {
private LocalDate clearingDate;
private Long companyId;
private String tradingStatus;
private String dayStatus;
public LocalDate getClearingDate() {
return clearingDate;
@ -33,12 +33,12 @@ public class ClearingCalendar extends BusinessObject {
this.companyId = value;
}
public String getTradingStatus() {
return tradingStatus;
public String getDayStatus() {
return dayStatus;
}
public void setTradingStatus(String value) {
this.tradingStatus = value;
public void setDayStatus(String value) {
this.dayStatus = value;
}
}

6
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/ClearingCalendarMapStore.java
View file

@ -30,7 +30,7 @@ public class ClearingCalendarMapStore extends TemplateMapStore<ClearingCalendar>
@Override
public String[] getFields() {
return new String[]{
"ID", "CREATED_AT", "UPDATED_AT", "CLEARING_DATE", "COMPANY_ID", "TRADING_STATUS"
"ID", "CREATED_AT", "UPDATED_AT", "CLEARING_DATE", "COMPANY_ID", "DAY_STATUS"
};
}
@ -42,7 +42,7 @@ public class ClearingCalendarMapStore extends TemplateMapStore<ClearingCalendar>
object.setUpdated(getInstantFromTimestamp(resultSet, "UPDATED_AT"));
object.setClearingDate(getLocalDateFromSqlDate(resultSet, "CLEARING_DATE"));
object.setCompanyId(resultSet.getObject("COMPANY_ID", Long.class));
object.setTradingStatus(resultSet.getObject("TRADING_STATUS", String.class));
object.setDayStatus(resultSet.getObject("DAY_STATUS", String.class));
return object;
}
@ -54,7 +54,7 @@ public class ClearingCalendarMapStore extends TemplateMapStore<ClearingCalendar>
TimeUtil.toDateFromInstant(object.getUpdated()),
TimeUtil.toDateFromLocalDate(object.getClearingDate()),
object.getCompanyId(),
object.getTradingStatus()
object.getDayStatus()
};
return args;
}

4
clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/ClearingCalendarService.java
View file

@ -50,7 +50,7 @@ public class ClearingCalendarService extends QueueConsumer implements Initializi
ClearingCalendar clearingCalendar = new ClearingCalendar();
clearingCalendar.setClearingDate(req.getClearingDate());
clearingCalendar.setCompanyId(req.getCompanyId());
clearingCalendar.setTradingStatus(req.getTradingStatus());
clearingCalendar.setDayStatus(req.getDayStatus());
clearingCalendarMap.insert(clearingCalendar);
log.debug("successfully processed, new id {}", clearingCalendar.getId());
}
@ -61,7 +61,7 @@ public class ClearingCalendarService extends QueueConsumer implements Initializi
ClearingCalendar clearingCalendar = clearingCalendarMap.getSingleObjectByID(req.getId());
clearingCalendar.setClearingDate(req.getClearingDate());
clearingCalendar.setCompanyId(req.getCompanyId());
clearingCalendar.setTradingStatus(req.getTradingStatus());
clearingCalendar.setDayStatus(req.getDayStatus());
clearingCalendarMap.update(clearingCalendar);
log.debug("successfully processed, new id {}", clearingCalendar.getId());
}

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

@ -16,7 +16,7 @@ public class ClearingCalendarNewRequest {
@JsonProperty
public Long companyId;
@JsonProperty
public String tradingStatus;
public String dayStatus;
public LocalDate getClearingDate() {
return clearingDate;
@ -34,11 +34,11 @@ public class ClearingCalendarNewRequest {
this.companyId = companyId;
}
public String getTradingStatus() {
return tradingStatus;
public String getDayStatus() {
return dayStatus;
}
public void setTradingStatus(String tradingStatus) {
this.tradingStatus = tradingStatus;
public void setDayStatus(String dayStatus) {
this.dayStatus = dayStatus;
}
}

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

@ -19,7 +19,7 @@ public class ClearingCalendarUpdateRequest {
@JsonProperty
public Long companyId;
@JsonProperty
public String tradingStatus;
public String dayStatus;
public Long getId() {
return id;
@ -45,11 +45,11 @@ public class ClearingCalendarUpdateRequest {
this.companyId = companyId;
}
public String getTradingStatus() {
return tradingStatus;
public String getDayStatus() {
return dayStatus;
}
public void setTradingStatus(String tradingStatus) {
this.tradingStatus = tradingStatus;
public void setDayStatus(String dayStatus) {
this.dayStatus = dayStatus;
}
}