diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/ClearingCalendarBackendGetAll.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/ClearingCalendarBackendGetAll.java index 0ae52878f..19e391a98 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/ClearingCalendarBackendGetAll.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/ClearingCalendarBackendGetAll.java @@ -17,18 +17,6 @@ public class ClearingCalendarBackendGetAll extends BasicSpcexResponse { @ApiModelProperty(value = "Полезная нагрузка") private ClearingCalendarBackendPayload payload = new ClearingCalendarBackendPayload(); - private static class ClearingCalendarBackendPayload { - private List items = new ArrayList<>(); - - public List getItems() { - return items; - } - - public void setItems(List 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 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/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/TradingCalendarBackendGetFields.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/TradingCalendarBackendGetFields.java index 121ee7b59..c864105f2 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/TradingCalendarBackendGetFields.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/TradingCalendarBackendGetFields.java @@ -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() { diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/ClearingCalendar.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/ClearingCalendar.java index 6ce41e7f3..85803a39b 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/ClearingCalendar.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/ClearingCalendar.java @@ -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; } } \ No newline at end of file diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/ClearingCalendarMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/ClearingCalendarMapStore.java index 453dbe661..0eebf1198 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/ClearingCalendarMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/ClearingCalendarMapStore.java @@ -30,7 +30,7 @@ public class ClearingCalendarMapStore extends TemplateMapStore @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 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 TimeUtil.toDateFromInstant(object.getUpdated()), TimeUtil.toDateFromLocalDate(object.getClearingDate()), object.getCompanyId(), - object.getTradingStatus() + object.getDayStatus() }; return args; } diff --git a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/ClearingCalendarService.java b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/ClearingCalendarService.java index 619368bcf..70bd24147 100644 --- a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/ClearingCalendarService.java +++ b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/ClearingCalendarService.java @@ -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()); } diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/ClearingCalendarNewRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/ClearingCalendarNewRequest.java index 06c61ac44..1e2669de7 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/ClearingCalendarNewRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/ClearingCalendarNewRequest.java @@ -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; } } diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/ClearingCalendarUpdateRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/ClearingCalendarUpdateRequest.java index aca653bea..2f70c4757 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/ClearingCalendarUpdateRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/ClearingCalendarUpdateRequest.java @@ -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; } }