From 276252b2a17f86399fa6252207f7f9deeeeb47a6 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Fri, 12 May 2023 15:41:58 +0300 Subject: [PATCH] =?UTF-8?q?backend-api=20=D0=B7=D0=B0=D1=87=D0=B8=D1=81?= =?UTF-8?q?=D1=82=D0=BA=D0=B0=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/company/CompanyBackendGetAll.java | 32 +- .../company/CompanyBackendGetFields.java | 279 +----------------- .../company/CompanyBackendInfoGetAll.java | 59 ---- .../company/CompanyBackendInfoGetFields.java | 176 ----------- .../ClearingCalendarBackendGetAll.java | 53 ---- .../schedule/LauncherBackendGetAll.java | 53 ---- .../schedule/LauncherBackendGetFields.java | 62 ---- .../SchedulerAllTodayBackendGetAll.java | 57 ---- .../SchedulerAllTodayBackendGetFields.java | 104 ------- .../schedule/SchedulerBackendGetAll.java | 57 ---- .../schedule/SchedulerBackendGetFields.java | 108 ------- .../schedule/TimetableBackendGetAll.java | 54 ---- .../schedule/TimetableBackendGetFields.java | 75 ----- .../TradingCalendarBackendGetFields.java | 75 ----- .../MoneyMarketSecurityBackendGetAll.java | 46 --- .../MoneyMarketSecurityBackendGetAllOld.java | 60 ---- .../MoneyMarketSecurityBackendGetFields.java | 123 -------- .../user/UserRoleSessionBackendGetAll.java | 53 ---- .../UserRoleSessionsBackendGetFields.java | 56 ---- .../user/UserSettingsBackendGetAll.java | 52 ---- .../user/UserSettingsBackendGetFields.java | 46 --- 21 files changed, 33 insertions(+), 1647 deletions(-) delete mode 100644 clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/company/CompanyBackendInfoGetAll.java delete mode 100644 clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/company/CompanyBackendInfoGetFields.java delete mode 100644 clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/ClearingCalendarBackendGetAll.java delete mode 100644 clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/LauncherBackendGetAll.java delete mode 100644 clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/LauncherBackendGetFields.java delete mode 100644 clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/SchedulerAllTodayBackendGetAll.java delete mode 100644 clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/SchedulerAllTodayBackendGetFields.java delete mode 100644 clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/SchedulerBackendGetAll.java delete mode 100644 clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/SchedulerBackendGetFields.java delete mode 100644 clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/TimetableBackendGetAll.java delete mode 100644 clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/TimetableBackendGetFields.java delete mode 100644 clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/TradingCalendarBackendGetFields.java delete mode 100644 clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/securities/MoneyMarketSecurityBackendGetAll.java delete mode 100644 clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/securities/MoneyMarketSecurityBackendGetAllOld.java delete mode 100644 clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/securities/MoneyMarketSecurityBackendGetFields.java delete mode 100644 clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/user/UserRoleSessionBackendGetAll.java delete mode 100644 clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/user/UserRoleSessionsBackendGetFields.java delete mode 100644 clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/user/UserSettingsBackendGetAll.java delete mode 100644 clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/user/UserSettingsBackendGetFields.java diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/company/CompanyBackendGetAll.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/company/CompanyBackendGetAll.java index b44738709..aa69dd436 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/company/CompanyBackendGetAll.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/company/CompanyBackendGetAll.java @@ -51,18 +51,26 @@ public class CompanyBackendGetAll extends BasicSpcexResponse { singleItem.setFullName(company.getFullName()); singleItem.setCreated(company.getCreated()); singleItem.setUpdated(company.getUpdated()); - CompanyInfo profile = company.getProfile(); - if (profile != null) { - singleItem.setCorporationSoleType(profile.getCorporationSoleType()); - singleItem.setCountryCode(profile.getCountryCode()); - singleItem.setDescription(profile.getDescription()); - singleItem.setProfessionalSign(profile.getProfessionalSign()); - singleItem.setLegalKind(profile.getLegalKind()); - singleItem.setOrganizationType(profile.getOrganizationType()); - singleItem.setResidence(profile.getResidence()); - singleItem.setShortNameEng(profile.getShortNameEng()); - singleItem.setFullNameEng(profile.getFullNameEng()); - } +// CompanyInfo profile = company.getProfile(); +// if (profile != null) { +// singleItem.setCorporationSoleType(profile.getCorporationSoleType()); +// singleItem.setCountryCode(profile.getCountryCode()); +// singleItem.setDescription(profile.getDescription()); +// singleItem.setProfessionalSign(profile.getProfessionalSign()); +// singleItem.setLegalKind(profile.getLegalKind()); +// singleItem.setOrganizationType(profile.getOrganizationType()); +// singleItem.setResidence(profile.getResidence()); +// singleItem.setShortNameEng(profile.getShortNameEng()); +// singleItem.setFullNameEng(profile.getFullNameEng()); +// } + /* todo + CompanySymbol companySymbol = ; + if (companySymbol!=null) { + + singleItem.setCompanySymbol(profile.getCompanySymbol()); + singleItem.setCompanySymbolValue(profile.getCompanySymbolValue()); + }*/ + payload.getItems().add(singleItem); } } diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/company/CompanyBackendGetFields.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/company/CompanyBackendGetFields.java index 97b4fb072..06089d595 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/company/CompanyBackendGetFields.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/company/CompanyBackendGetFields.java @@ -16,37 +16,21 @@ public class CompanyBackendGetFields { @JsonProperty private String registrationCode; @JsonProperty - private String workflowStatus; // WorkflowStatusDictionary + private String workflowStatus; @JsonProperty private String shortName; @JsonProperty private String fullName; + @JsonProperty + private String companySymbol; + @JsonProperty + private String companySymbolValue; @JsonSerialize(using = InstantSerializer.class) @JsonProperty private Instant created; @JsonSerialize(using = InstantSerializer.class) @JsonProperty private Instant updated; - @JsonProperty - private String clearingMemberCategory; // ref CHAR(4), - @JsonProperty - private String corporationSoleType; // ref CHAR(4), - @JsonProperty - private String countryCode; //ref CHAR(4), - @JsonProperty - private String description; - @JsonProperty - private String professionalSign; // ref CHAR(4), - @JsonProperty - private String legalKind; // ref CHAR(4), - @JsonProperty - private String organizationType; // ref CHAR(4), - @JsonProperty - private String residence; // ref CHAR(4), - @JsonProperty - private String shortNameEng; - @JsonProperty - private String fullNameEng; public Long getId() { return id; @@ -120,256 +104,19 @@ public class CompanyBackendGetFields { this.updated = updated; } - public String getClearingMemberCategory() { - return clearingMemberCategory; + public String getCompanySymbol() { + return companySymbol; } - public void setClearingMemberCategory(String clearingMemberCategory) { - this.clearingMemberCategory = clearingMemberCategory; + public void setCompanySymbol(String companySymbol) { + this.companySymbol = companySymbol; } - public String getCorporationSoleType() { - return corporationSoleType; + public String getCompanySymbolValue() { + return companySymbolValue; } - public void setCorporationSoleType(String corporationSoleType) { - this.corporationSoleType = corporationSoleType; + public void setCompanySymbolValue(String companySymbolValue) { + this.companySymbolValue = companySymbolValue; } - - public String getCountryCode() { - return countryCode; - } - - public void setCountryCode(String countryCode) { - this.countryCode = countryCode; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public String getProfessionalSign() { - return professionalSign; - } - - public void setProfessionalSign(String professionalSign) { - this.professionalSign = professionalSign; - } - - public String getLegalKind() { - return legalKind; - } - - public void setLegalKind(String legalKind) { - this.legalKind = legalKind; - } - - public String getOrganizationType() { - return organizationType; - } - - public void setOrganizationType(String organizationType) { - this.organizationType = organizationType; - } - - public String getResidence() { - return residence; - } - - public void setResidence(String residence) { - this.residence = residence; - } - - public String getShortNameEng() { - return shortNameEng; - } - - public void setShortNameEng(String shortNameEng) { - this.shortNameEng = shortNameEng; - } - - public String getFullNameEng() { - return fullNameEng; - } - - public void setFullNameEng(String fullNameEng) { - this.fullNameEng = fullNameEng; - } - - // static class CompanyInfoFields { -// @JsonProperty -// private Long id; -// @JsonProperty -// private Long companyId; // Company.CompanyInfo.companyId = CompanyInfo.id -// @JsonProperty -// private String clearingMemberCategory; // ref CHAR(4), -// @JsonProperty -// private String corporationSoleType; // ref CHAR(4), -// @JsonProperty -// private String countryCode; //ref CHAR(4), -// @JsonProperty -// private String description; -// @JsonProperty -// private String professionalSign; // ref CHAR(4), -// @JsonProperty -// private String legalKind; // ref CHAR(4), -// @JsonProperty -// private String organizationType; // ref CHAR(4), -// @JsonProperty -// private String residence; // ref CHAR(4), -// @JsonProperty -// private String shortName; -// @JsonProperty -// private String fullName; -// @JsonProperty -// private String shortNameEng; -// @JsonProperty -// private String fullNameEng; -// @JsonProperty -// private String tradingCode; -// @JsonProperty -// private String clearingCode; -// @JsonProperty -// private String registrationCode; -// -// public Long getCompanyId() { -// return companyId; -// } -// -// public void setCompanyId(Long companyId) { -// this.companyId = companyId; -// } -// -// public String getClearingMemberCategory() { -// return clearingMemberCategory; -// } -// -// public void setClearingMemberCategory(String clearingMemberCategory) { -// this.clearingMemberCategory = clearingMemberCategory; -// } -// -// public String getCorporationSoleType() { -// return corporationSoleType; -// } -// -// public void setCorporationSoleType(String corporationSoleType) { -// this.corporationSoleType = corporationSoleType; -// } -// -// public String getCountryCode() { -// return countryCode; -// } -// -// public void setCountryCode(String countryCode) { -// this.countryCode = countryCode; -// } -// -// public String getDescription() { -// return description; -// } -// -// public void setDescription(String description) { -// this.description = description; -// } -// -// public String getProfessionalSign() { -// return professionalSign; -// } -// -// public void setProfessionalSign(String professionalSign) { -// this.professionalSign = professionalSign; -// } -// -// public String getLegalKind() { -// return legalKind; -// } -// -// public void setLegalKind(String legalKind) { -// this.legalKind = legalKind; -// } -// -// public String getOrganizationType() { -// return organizationType; -// } -// -// public void setOrganizationType(String organizationType) { -// this.organizationType = organizationType; -// } -// -// public String getResidence() { -// return residence; -// } -// -// public void setResidence(String residence) { -// this.residence = residence; -// } -// -// public String getShortName() { -// return shortName; -// } -// -// public void setShortName(String shortName) { -// this.shortName = shortName; -// } -// -// public String getFullName() { -// return fullName; -// } -// -// public void setFullName(String fullName) { -// this.fullName = fullName; -// } -// -// public String getShortNameEng() { -// return shortNameEng; -// } -// -// public void setShortNameEng(String shortNameEng) { -// this.shortNameEng = shortNameEng; -// } -// -// public String getFullNameEng() { -// return fullNameEng; -// } -// -// public void setFullNameEng(String fullNameEng) { -// this.fullNameEng = fullNameEng; -// } -// -// public String getTradingCode() { -// return tradingCode; -// } -// -// public void setTradingCode(String tradingCode) { -// this.tradingCode = tradingCode; -// } -// -// public String getClearingCode() { -// return clearingCode; -// } -// -// public void setClearingCode(String clearingCode) { -// this.clearingCode = clearingCode; -// } -// -// public String getRegistrationCode() { -// return registrationCode; -// } -// -// public void setRegistrationCode(String registrationCode) { -// this.registrationCode = registrationCode; -// } -// -// public Long getId() { -// return id; -// } -// -// public void setId(Long id) { -// this.id = id; -// } -// } } diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/company/CompanyBackendInfoGetAll.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/company/CompanyBackendInfoGetAll.java deleted file mode 100644 index f696f17bc..000000000 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/company/CompanyBackendInfoGetAll.java +++ /dev/null @@ -1,59 +0,0 @@ -package ru.spcex.clearing.backendapi.controller.response.entity.company; - -import com.fasterxml.jackson.annotation.JsonProperty; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import ru.clearing.classes.statics.data.profile.CompanyInfo; -import ru.spcex.clearing.backendapi.controller.response.BasicSpcexResponse; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -@ApiModel(description = "Ответ при получении объектов CompanyInfo.") -public class CompanyBackendInfoGetAll extends BasicSpcexResponse { - - @JsonProperty - @ApiModelProperty(value = "Полезная нагрузка") - private CompanyInfoBackendPayload payload = new CompanyInfoBackendPayload(); - - private static class CompanyInfoBackendPayload { - private List items = new ArrayList<>(); - - public List getItems() { - return items; - } - - public void setItems(List items) { - this.items = items; - } - } - - public CompanyInfoBackendPayload getPayload() { - return payload; - } - - public void setPayload(CompanyInfoBackendPayload payload) { - this.payload = payload; - } - - public void fromEntity(Collection companyInfos) { - var payload = this.getPayload(); - for (var companyInfo : companyInfos) { - var singleItem = new CompanyBackendInfoGetFields(); - singleItem.setId(companyInfo.getId()); - singleItem.setCompanyId(companyInfo.getCompanyId()); - singleItem.setCorporationSoleType(companyInfo.getCorporationSoleType()); - singleItem.setCountryCode(companyInfo.getCountryCode()); - singleItem.setDescription(companyInfo.getDescription()); - singleItem.setProfessionalSign(companyInfo.getProfessionalSign()); - singleItem.setLegalKind(companyInfo.getLegalKind()); - singleItem.setOrganizationType(companyInfo.getOrganizationType()); - singleItem.setResidence(companyInfo.getResidence()); - singleItem.setShortNameEng(companyInfo.getShortNameEng()); - singleItem.setFullNameEng(companyInfo.getFullNameEng()); - payload.getItems().add(singleItem); - } - } - -} \ No newline at end of file diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/company/CompanyBackendInfoGetFields.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/company/CompanyBackendInfoGetFields.java deleted file mode 100644 index 501f4b749..000000000 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/company/CompanyBackendInfoGetFields.java +++ /dev/null @@ -1,176 +0,0 @@ -package ru.spcex.clearing.backendapi.controller.response.entity.company; - -import com.fasterxml.jackson.annotation.JsonProperty; - -public class CompanyBackendInfoGetFields { - @JsonProperty - private Long id; - @JsonProperty - private Long companyId; - @JsonProperty - private String clearingMemberCategory; - @JsonProperty - private String corporationSoleType; - @JsonProperty - private String countryCode; - @JsonProperty - private String description; - @JsonProperty - private String professionalSign; - @JsonProperty - private String legalKind; - @JsonProperty - private String organizationType; - @JsonProperty - private String residence; - @JsonProperty - private String shortName; - @JsonProperty - private String fullName; - @JsonProperty - private String shortNameEng; - @JsonProperty - private String fullNameEng; - @JsonProperty - private String tradingCode; - @JsonProperty - private String clearingCode; - @JsonProperty - private String registrationCode; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Long getCompanyId() { - return companyId; - } - - public void setCompanyId(Long companyId) { - this.companyId = companyId; - } - - public String getClearingMemberCategory() { - return clearingMemberCategory; - } - - public void setClearingMemberCategory(String clearingMemberCategory) { - this.clearingMemberCategory = clearingMemberCategory; - } - - public String getCorporationSoleType() { - return corporationSoleType; - } - - public void setCorporationSoleType(String corporationSoleType) { - this.corporationSoleType = corporationSoleType; - } - - public String getCountryCode() { - return countryCode; - } - - public void setCountryCode(String countryCode) { - this.countryCode = countryCode; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public String getProfessionalSign() { - return professionalSign; - } - - public void setProfessionalSign(String professionalSign) { - this.professionalSign = professionalSign; - } - - public String getLegalKind() { - return legalKind; - } - - public void setLegalKind(String legalKind) { - this.legalKind = legalKind; - } - - public String getOrganizationType() { - return organizationType; - } - - public void setOrganizationType(String organizationType) { - this.organizationType = organizationType; - } - - public String getResidence() { - return residence; - } - - public void setResidence(String residence) { - this.residence = residence; - } - - public String getShortName() { - return shortName; - } - - public void setShortName(String shortName) { - this.shortName = shortName; - } - - public String getFullName() { - return fullName; - } - - public void setFullName(String fullName) { - this.fullName = fullName; - } - - public String getShortNameEng() { - return shortNameEng; - } - - public void setShortNameEng(String shortNameEng) { - this.shortNameEng = shortNameEng; - } - - public String getFullNameEng() { - return fullNameEng; - } - - public void setFullNameEng(String fullNameEng) { - this.fullNameEng = fullNameEng; - } - - public String getTradingCode() { - return tradingCode; - } - - public void setTradingCode(String tradingCode) { - this.tradingCode = tradingCode; - } - - public String getClearingCode() { - return clearingCode; - } - - public void setClearingCode(String clearingCode) { - this.clearingCode = clearingCode; - } - - public String getRegistrationCode() { - return registrationCode; - } - - public void setRegistrationCode(String registrationCode) { - this.registrationCode = registrationCode; - } -} 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 deleted file mode 100644 index 19e391a98..000000000 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/ClearingCalendarBackendGetAll.java +++ /dev/null @@ -1,53 +0,0 @@ -package ru.spcex.clearing.backendapi.controller.response.entity.schedule; - -import com.fasterxml.jackson.annotation.JsonProperty; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import ru.clearing.classes.statics.data.scheduler.ClearingCalendar; -import ru.spcex.clearing.backendapi.controller.response.BasicSpcexResponse; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -@ApiModel(description = "Ответ при получении объектов TradingCalendar.") -public class ClearingCalendarBackendGetAll extends BasicSpcexResponse { - - @JsonProperty - @ApiModelProperty(value = "Полезная нагрузка") - private ClearingCalendarBackendPayload payload = new ClearingCalendarBackendPayload(); - - public ClearingCalendarBackendPayload getPayload() { - return payload; - } - - public void setPayload(ClearingCalendarBackendPayload payload) { - this.payload = payload; - } - - public void fromEntity(Collection tradingCalendars) { - var payload = this.getPayload(); - for (var tradingCalendar : tradingCalendars) { - var singleItem = new TradingCalendarBackendGetFields(); - singleItem.setId(tradingCalendar.getId()); - singleItem.setClearingDate(tradingCalendar.getClearingDate()); - singleItem.setCompanyId(tradingCalendar.getCompanyId()); - 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/LauncherBackendGetAll.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/LauncherBackendGetAll.java deleted file mode 100644 index 2f8258b68..000000000 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/LauncherBackendGetAll.java +++ /dev/null @@ -1,53 +0,0 @@ -package ru.spcex.clearing.backendapi.controller.response.entity.schedule; - -import com.fasterxml.jackson.annotation.JsonProperty; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import ru.clearing.classes.statics.data.scheduler.Launcher; -import ru.spcex.clearing.backendapi.controller.response.BasicSpcexResponse; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -@ApiModel(description = "Ответ при получении объектов TaskRunner.") -public class LauncherBackendGetAll extends BasicSpcexResponse { - - @JsonProperty - @ApiModelProperty(value = "Полезная нагрузка") - private LauncherBackendPayload payload = new LauncherBackendPayload(); - - private static class LauncherBackendPayload { - private List items = new ArrayList<>(); - - public List getItems() { - return items; - } - - public void setItems(List items) { - this.items = items; - } - } - - public LauncherBackendPayload getPayload() { - return payload; - } - - public void setPayload(LauncherBackendPayload payload) { - this.payload = payload; - } - - public void fromEntity(Collection taskRunners) { - var payload = this.getPayload(); - for (var taskRunner : taskRunners) { - var singleItem = new LauncherBackendGetFields(); - singleItem.setId(taskRunner.getId()); - singleItem.setSenderId(taskRunner.getSenderId()); - singleItem.setTask(taskRunner.getTask()); - singleItem.setCreated(taskRunner.getCreated()); - singleItem.setUpdated(taskRunner.getUpdated()); - payload.getItems().add(singleItem); - } - } - -} \ No newline at end of file diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/LauncherBackendGetFields.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/LauncherBackendGetFields.java deleted file mode 100644 index 6e4ab702d..000000000 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/LauncherBackendGetFields.java +++ /dev/null @@ -1,62 +0,0 @@ -package ru.spcex.clearing.backendapi.controller.response.entity.schedule; - -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantSerializer; - -import java.time.Instant; - -public class LauncherBackendGetFields { - @JsonProperty - private Long id; - @JsonProperty - private Long senderId; - @JsonProperty - private String task; - @JsonSerialize(using = InstantSerializer.class) - @JsonProperty - private Instant created; - @JsonSerialize(using = InstantSerializer.class) - @JsonProperty - private Instant updated; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Long getSenderId() { - return senderId; - } - - public void setSenderId(Long senderId) { - this.senderId = senderId; - } - - public String getTask() { - return task; - } - - public void setTask(String task) { - this.task = task; - } - - public Instant getCreated() { - return created; - } - - public void setCreated(Instant created) { - this.created = created; - } - - public Instant getUpdated() { - return updated; - } - - public void setUpdated(Instant updated) { - this.updated = updated; - } -} 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 deleted file mode 100644 index f2e8ce7c6..000000000 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/SchedulerAllTodayBackendGetAll.java +++ /dev/null @@ -1,57 +0,0 @@ -package ru.spcex.clearing.backendapi.controller.response.entity.schedule; - -import com.fasterxml.jackson.annotation.JsonProperty; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import ru.clearing.classes.statics.data.scheduler.PlannerAllToday; -import ru.spcex.clearing.backendapi.controller.response.BasicSpcexResponse; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -@ApiModel(description = "Ответ при получении объектов SchedulerAllToday.") -public class SchedulerAllTodayBackendGetAll extends BasicSpcexResponse { - - @JsonProperty - @ApiModelProperty(value = "Полезная нагрузка") - private SchedulerAllTodayBackendPayload payload = new SchedulerAllTodayBackendPayload(); - - public SchedulerAllTodayBackendPayload getPayload() { - return payload; - } - - public void setPayload(SchedulerAllTodayBackendPayload payload) { - this.payload = payload; - } - - public void fromEntity(Collection schedulersAllToday) { - var payload = this.getPayload(); - for (var schedulerAllToday : schedulersAllToday) { - var singleItem = new SchedulerAllTodayBackendGetFields(); - singleItem.setId(schedulerAllToday.getId()); - singleItem.setTask(schedulerAllToday.getTask()); - singleItem.setTaskTime(schedulerAllToday.getTaskTime()); - singleItem.setClearingDate(schedulerAllToday.getClearingDate()); - singleItem.setMarket(schedulerAllToday.getMarket()); - singleItem.setTaskStatus(schedulerAllToday.getTaskStatus()); - singleItem.setSecurityId(schedulerAllToday.getSecurityId()); - 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/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/SchedulerAllTodayBackendGetFields.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/SchedulerAllTodayBackendGetFields.java deleted file mode 100644 index ae70af9f1..000000000 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/SchedulerAllTodayBackendGetFields.java +++ /dev/null @@ -1,104 +0,0 @@ -package ru.spcex.clearing.backendapi.controller.response.entity.schedule; - -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSerializer; -import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalTimeSerializer; - -import java.time.LocalDate; -import java.time.LocalTime; - -public class SchedulerAllTodayBackendGetFields { - @JsonProperty - private Long id; - @JsonProperty - private String task; - @JsonProperty - @JsonSerialize(using = LocalTimeSerializer.class) - private LocalTime taskTime; - @JsonProperty - @JsonSerialize(using = LocalDateSerializer.class) - private LocalDate clearingDate; - @JsonProperty - private String market; - @JsonProperty - private String taskStatus; - @JsonProperty - private Long securityId; - @JsonProperty - private String source; - @JsonProperty - private Long origId; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getTask() { - return task; - } - - public void setTask(String task) { - this.task = task; - } - - public LocalTime getTaskTime() { - return taskTime; - } - - public void setTaskTime(LocalTime taskTime) { - this.taskTime = taskTime; - } - - public LocalDate getClearingDate() { - return clearingDate; - } - - public void setClearingDate(LocalDate clearingDate) { - this.clearingDate = clearingDate; - } - - public String getMarket() { - return market; - } - - public void setMarket(String market) { - this.market = market; - } - - public String getTaskStatus() { - return taskStatus; - } - - public void setTaskStatus(String taskStatus) { - this.taskStatus = taskStatus; - } - - public Long getSecurityId() { - return securityId; - } - - public void setSecurityId(Long securityId) { - this.securityId = securityId; - } - - public String getSource() { - return source; - } - - public void setSource(String source) { - this.source = source; - } - - public Long getOrigId() { - return origId; - } - - public void setOrigId(Long origId) { - this.origId = origId; - } -} diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/SchedulerBackendGetAll.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/SchedulerBackendGetAll.java deleted file mode 100644 index 28863b431..000000000 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/SchedulerBackendGetAll.java +++ /dev/null @@ -1,57 +0,0 @@ -package ru.spcex.clearing.backendapi.controller.response.entity.schedule; - -import com.fasterxml.jackson.annotation.JsonProperty; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import ru.clearing.classes.statics.data.scheduler.Planner; -import ru.spcex.clearing.backendapi.controller.response.BasicSpcexResponse; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -@ApiModel(description = "Ответ при получении объектов Scheduler.") -public class SchedulerBackendGetAll extends BasicSpcexResponse { - - @JsonProperty - @ApiModelProperty(value = "Полезная нагрузка") - private SchedulerBackendPayload payload = new SchedulerBackendPayload(); - - private static class SchedulerBackendPayload { - private List items = new ArrayList<>(); - - public List getItems() { - return items; - } - - public void setItems(List items) { - this.items = items; - } - } - - public SchedulerBackendPayload getPayload() { - return payload; - } - - public void setPayload(SchedulerBackendPayload payload) { - this.payload = payload; - } - - public void fromEntity(Collection schedulers) { - var payload = this.getPayload(); - for (var scheduler : schedulers) { - var singleItem = new SchedulerBackendGetFields(); - singleItem.setId(scheduler.getId()); - singleItem.setTask(scheduler.getTask()); - singleItem.setTaskTime(scheduler.getTaskTime()); - singleItem.setClearingDate(scheduler.getClearingDate()); - singleItem.setMarket(scheduler.getMarket()); - singleItem.setTaskStatus(scheduler.getTaskStatus()); - singleItem.setSecurityId(scheduler.getSecurityId()); - singleItem.setCreated(scheduler.getCreated()); - singleItem.setUpdated(scheduler.getUpdated()); - payload.getItems().add(singleItem); - } - } - -} \ No newline at end of file diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/SchedulerBackendGetFields.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/SchedulerBackendGetFields.java deleted file mode 100644 index 71561a8d1..000000000 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/SchedulerBackendGetFields.java +++ /dev/null @@ -1,108 +0,0 @@ -package ru.spcex.clearing.backendapi.controller.response.entity.schedule; - -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantSerializer; -import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSerializer; -import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalTimeSerializer; - -import java.time.Instant; -import java.time.LocalDate; -import java.time.LocalTime; - -public class SchedulerBackendGetFields { - @JsonProperty - private Long id; - @JsonProperty - private String task; - @JsonProperty - @JsonSerialize(using = LocalTimeSerializer.class) - private LocalTime taskTime; - @JsonProperty - @JsonSerialize(using = LocalDateSerializer.class) - private LocalDate clearingDate; - @JsonProperty - private String market; - @JsonProperty - private String taskStatus; - @JsonProperty - private Long securityId; - @JsonProperty - @JsonSerialize(using = InstantSerializer.class) - private Instant created; - @JsonProperty - @JsonSerialize(using = InstantSerializer.class) - private Instant updated; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getTask() { - return task; - } - - public void setTask(String task) { - this.task = task; - } - - public LocalTime getTaskTime() { - return taskTime; - } - - public void setTaskTime(LocalTime taskTime) { - this.taskTime = taskTime; - } - - public LocalDate getClearingDate() { - return clearingDate; - } - - public void setClearingDate(LocalDate clearingDate) { - this.clearingDate = clearingDate; - } - - public String getMarket() { - return market; - } - - public void setMarket(String market) { - this.market = market; - } - - public String getTaskStatus() { - return taskStatus; - } - - public void setTaskStatus(String taskStatus) { - this.taskStatus = taskStatus; - } - - public Long getSecurityId() { - return securityId; - } - - public void setSecurityId(Long securityId) { - this.securityId = securityId; - } - - public Instant getCreated() { - return created; - } - - public void setCreated(Instant created) { - this.created = created; - } - - public Instant getUpdated() { - return updated; - } - - public void setUpdated(Instant updated) { - this.updated = updated; - } -} diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/TimetableBackendGetAll.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/TimetableBackendGetAll.java deleted file mode 100644 index cf7090e33..000000000 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/TimetableBackendGetAll.java +++ /dev/null @@ -1,54 +0,0 @@ -package ru.spcex.clearing.backendapi.controller.response.entity.schedule; - -import com.fasterxml.jackson.annotation.JsonProperty; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import ru.clearing.classes.statics.data.scheduler.PlannerTemplate; -import ru.spcex.clearing.backendapi.controller.response.BasicSpcexResponse; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -@ApiModel(description = "Ответ при получении объектов Timetable.") -public class TimetableBackendGetAll extends BasicSpcexResponse { - - @JsonProperty - @ApiModelProperty(value = "Полезная нагрузка") - private TimetableBackendPayload payload = new TimetableBackendPayload(); - - private static class TimetableBackendPayload { - private List items = new ArrayList<>(); - - public List getItems() { - return items; - } - - public void setItems(List items) { - this.items = items; - } - } - - public TimetableBackendPayload getPayload() { - return payload; - } - - public void setPayload(TimetableBackendPayload payload) { - this.payload = payload; - } - - public void fromEntity(Collection timeTables) { - var payload = this.getPayload(); - for (var timetable : timeTables) { - var singleItem = new TimetableBackendGetFields(); - singleItem.setId(timetable.getId()); - singleItem.setTask(timetable.getTask()); - singleItem.setTaskTime(timetable.getTaskTime()); - singleItem.setTaskStatus(timetable.getTaskStatus()); - singleItem.setCreated(timetable.getCreated()); - singleItem.setUpdated(timetable.getUpdated()); - payload.getItems().add(singleItem); - } - } - -} \ No newline at end of file diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/TimetableBackendGetFields.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/TimetableBackendGetFields.java deleted file mode 100644 index a348b0799..000000000 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/TimetableBackendGetFields.java +++ /dev/null @@ -1,75 +0,0 @@ -package ru.spcex.clearing.backendapi.controller.response.entity.schedule; - -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantSerializer; -import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalTimeSerializer; - -import java.time.Instant; -import java.time.LocalTime; - -public class TimetableBackendGetFields { - @JsonProperty - private Long id; - @JsonProperty - private String task; - @JsonProperty - @JsonSerialize(using = LocalTimeSerializer.class) - private LocalTime taskTime; - @JsonProperty - private String taskStatus; - @JsonProperty - @JsonSerialize(using = InstantSerializer.class) - private Instant created; - @JsonProperty - @JsonSerialize(using = InstantSerializer.class) - private Instant updated; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getTask() { - return task; - } - - public void setTask(String task) { - this.task = task; - } - - public LocalTime getTaskTime() { - return taskTime; - } - - public void setTaskTime(LocalTime taskTime) { - this.taskTime = taskTime; - } - - public String getTaskStatus() { - return taskStatus; - } - - public void setTaskStatus(String taskStatus) { - this.taskStatus = taskStatus; - } - - public Instant getCreated() { - return created; - } - - public void setCreated(Instant created) { - this.created = created; - } - - public Instant getUpdated() { - return updated; - } - - public void setUpdated(Instant updated) { - this.updated = updated; - } -} 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 deleted file mode 100644 index c864105f2..000000000 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/TradingCalendarBackendGetFields.java +++ /dev/null @@ -1,75 +0,0 @@ -package ru.spcex.clearing.backendapi.controller.response.entity.schedule; - -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantSerializer; -import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSerializer; - -import java.time.Instant; -import java.time.LocalDate; - -public class TradingCalendarBackendGetFields { - @JsonProperty - private Long id; - @JsonProperty - @JsonSerialize(using = LocalDateSerializer.class) - private LocalDate clearingDate; - @JsonProperty - private Long companyId; - @JsonProperty - private String dayStatus; - @JsonProperty - @JsonSerialize(using = InstantSerializer.class) - private Instant created; - @JsonProperty - @JsonSerialize(using = InstantSerializer.class) - private Instant updated; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public LocalDate getClearingDate() { - return clearingDate; - } - - public void setClearingDate(LocalDate clearingDate) { - this.clearingDate = clearingDate; - } - - public Long getCompanyId() { - return companyId; - } - - public void setCompanyId(Long companyId) { - this.companyId = companyId; - } - - public String getDayStatus() { - return dayStatus; - } - - public void setDayStatus(String dayStatus) { - this.dayStatus = dayStatus; - } - - public Instant getCreated() { - return created; - } - - public void setCreated(Instant created) { - this.created = created; - } - - public Instant getUpdated() { - return updated; - } - - public void setUpdated(Instant updated) { - this.updated = updated; - } -} diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/securities/MoneyMarketSecurityBackendGetAll.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/securities/MoneyMarketSecurityBackendGetAll.java deleted file mode 100644 index c19295725..000000000 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/securities/MoneyMarketSecurityBackendGetAll.java +++ /dev/null @@ -1,46 +0,0 @@ -package ru.spcex.clearing.backendapi.controller.response.entity.securities; - -import com.fasterxml.jackson.annotation.JsonProperty; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import ru.spcex.clearing.backendapi.controller.response.BasicSpcexResponse; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Map; - -@ApiModel(description = "Ответ при получении объектов MoneyMarketSecurity.") -public class MoneyMarketSecurityBackendGetAll extends BasicSpcexResponse { - - @JsonProperty - @ApiModelProperty(value = "Полезная нагрузка") - private MoneyMarketSecurityBackendPayload payload = new MoneyMarketSecurityBackendPayload(); - - private static class MoneyMarketSecurityBackendPayload { - private List> items = new ArrayList<>(); - - public List> getItems() { - return items; - } - - public void setItems(List> items) { - this.items = items; - } - } - - public MoneyMarketSecurityBackendPayload getPayload() { - return payload; - } - - public void setPayload(MoneyMarketSecurityBackendPayload payload) { - this.payload = payload; - } - - public void fromEntity(Collection> moneyMarketSecurities) { - var payload = this.getPayload(); - for (Map moneyMarketSecurity : moneyMarketSecurities) { - payload.getItems().add(moneyMarketSecurity); - } - } -} \ No newline at end of file diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/securities/MoneyMarketSecurityBackendGetAllOld.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/securities/MoneyMarketSecurityBackendGetAllOld.java deleted file mode 100644 index 875305748..000000000 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/securities/MoneyMarketSecurityBackendGetAllOld.java +++ /dev/null @@ -1,60 +0,0 @@ -package ru.spcex.clearing.backendapi.controller.response.entity.securities; - -import com.fasterxml.jackson.annotation.JsonProperty; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import ru.clearing.classes.statics.data.misc.MoneyMarketSecurity; -import ru.spcex.clearing.backendapi.controller.response.BasicSpcexResponse; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -@Deprecated -@ApiModel(description = "Ответ при получении объектов MoneyMarketSecurity.") -public class MoneyMarketSecurityBackendGetAllOld extends BasicSpcexResponse { - - @JsonProperty - @ApiModelProperty(value = "Полезная нагрузка") - private MoneyMarketSecurityBackendPayload payload = new MoneyMarketSecurityBackendPayload(); - - public MoneyMarketSecurityBackendPayload getPayload() { - return payload; - } - - public void setPayload(MoneyMarketSecurityBackendPayload payload) { - this.payload = payload; - } - - public void fromEntity(Collection moneyMarketSecurities) { - var payload = this.getPayload(); - for (MoneyMarketSecurity moneyMarketSecurity : moneyMarketSecurities) { - var singleItem = new MoneyMarketSecurityBackendGetFields(); - singleItem.setId(moneyMarketSecurity.getId()); - singleItem.setSecurityId(moneyMarketSecurity.getSecurityId()); - singleItem.setDescription(moneyMarketSecurity.getDescription()); - singleItem.setStartDate(moneyMarketSecurity.getStartDate()); - singleItem.setEndDate(moneyMarketSecurity.getEndDate()); - singleItem.setNominalValue(moneyMarketSecurity.getNominalValue()); - singleItem.setNominalCurrency(moneyMarketSecurity.getNominalCurrency()); - singleItem.setInstrumentType(moneyMarketSecurity.getInstrumentType()); - singleItem.setFullName(moneyMarketSecurity.getFullName()); - singleItem.setSecuritySymbol(moneyMarketSecurity.getSecuritySymbol()); - singleItem.setTermType(moneyMarketSecurity.getTermType()); - payload.getItems().add(singleItem); - } - } - - private static class MoneyMarketSecurityBackendPayload { - 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/securities/MoneyMarketSecurityBackendGetFields.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/securities/MoneyMarketSecurityBackendGetFields.java deleted file mode 100644 index f32ba9f5b..000000000 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/securities/MoneyMarketSecurityBackendGetFields.java +++ /dev/null @@ -1,123 +0,0 @@ -package ru.spcex.clearing.backendapi.controller.response.entity.securities; - -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSerializer; - -import java.math.BigDecimal; -import java.time.LocalDate; - -public class MoneyMarketSecurityBackendGetFields { - @JsonProperty - private Long id; - @JsonProperty - private Long securityId;// (linked to security) - @JsonProperty - private String description; - @JsonSerialize(using = LocalDateSerializer.class) - @JsonProperty - private LocalDate startDate; - @JsonSerialize(using = LocalDateSerializer.class) - @JsonProperty - private LocalDate endDate; - @JsonProperty - private BigDecimal nominalValue; - @JsonProperty - private String nominalCurrency; // (linked to currencyCode) - @JsonProperty - private String instrumentType; // (linked to instrumentType) - @JsonProperty - private String fullName; - @JsonProperty - private String securitySymbol; - @JsonProperty - private String termType; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Long getSecurityId() { - return securityId; - } - - public void setSecurityId(Long securityId) { - this.securityId = securityId; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public LocalDate getStartDate() { - return startDate; - } - - public void setStartDate(LocalDate startDate) { - this.startDate = startDate; - } - - public LocalDate getEndDate() { - return endDate; - } - - public void setEndDate(LocalDate endDate) { - this.endDate = endDate; - } - - public BigDecimal getNominalValue() { - return nominalValue; - } - - public void setNominalValue(BigDecimal nominalValue) { - this.nominalValue = nominalValue; - } - - public String getNominalCurrency() { - return nominalCurrency; - } - - public void setNominalCurrency(String nominalCurrency) { - this.nominalCurrency = nominalCurrency; - } - - public String getInstrumentType() { - return instrumentType; - } - - public void setInstrumentType(String instrumentType) { - this.instrumentType = instrumentType; - } - - public String getFullName() { - return fullName; - } - - public void setFullName(String fullName) { - this.fullName = fullName; - } - - public String getSecuritySymbol() { - return securitySymbol; - } - - public void setSecuritySymbol(String securitySymbol) { - this.securitySymbol = securitySymbol; - } - - public String getTermType() { - return termType; - } - - public void setTermType(String termType) { - this.termType = termType; - } -} diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/user/UserRoleSessionBackendGetAll.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/user/UserRoleSessionBackendGetAll.java deleted file mode 100644 index 243fc2129..000000000 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/user/UserRoleSessionBackendGetAll.java +++ /dev/null @@ -1,53 +0,0 @@ -package ru.spcex.clearing.backendapi.controller.response.entity.user; - -import com.fasterxml.jackson.annotation.JsonProperty; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import ru.clearing.classes.statics.data.user.UserRoleSession; -import ru.spcex.clearing.backendapi.controller.response.BasicSpcexResponse; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -@ApiModel(description = "Ответ при получении объектов UserRoleSession.") -public class UserRoleSessionBackendGetAll extends BasicSpcexResponse { - - @JsonProperty - @ApiModelProperty(value = "Полезная нагрузка") - private UserRoleSessionBackendPayload payload = new UserRoleSessionBackendPayload(); - - private static class UserRoleSessionBackendPayload { - private List items = new ArrayList<>(); - - public List getItems() { - return items; - } - - public void setItems(List items) { - this.items = items; - } - } - - public UserRoleSessionBackendPayload getPayload() { - return payload; - } - - public void setPayload(UserRoleSessionBackendPayload payload) { - this.payload = payload; - } - - public void fromEntity(Collection userRoleSessions) { - var payload = this.getPayload(); - for (var userRoleSession : userRoleSessions) { - var singleItem = new UserRoleSessionsBackendGetFields(); - singleItem.setId(userRoleSession.getId()); - singleItem.setUserId(userRoleSession.getUserId()); - singleItem.setUserRole(userRoleSession.getUserRole()); - singleItem.setCompanyId(userRoleSession.getCompanyId()); - singleItem.setStatus(userRoleSession.getStatus()); - payload.getItems().add(singleItem); - } - } - -} \ No newline at end of file diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/user/UserRoleSessionsBackendGetFields.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/user/UserRoleSessionsBackendGetFields.java deleted file mode 100644 index d56bfc1b5..000000000 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/user/UserRoleSessionsBackendGetFields.java +++ /dev/null @@ -1,56 +0,0 @@ -package ru.spcex.clearing.backendapi.controller.response.entity.user; - -import com.fasterxml.jackson.annotation.JsonProperty; - -public class UserRoleSessionsBackendGetFields { - @JsonProperty - private Long id; - @JsonProperty - private Long userId; - @JsonProperty - private String userRole; - @JsonProperty - private Long companyId; - @JsonProperty - private String status; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Long getUserId() { - return userId; - } - - public void setUserId(Long userId) { - this.userId = userId; - } - - public String getUserRole() { - return userRole; - } - - public void setUserRole(String userRole) { - this.userRole = userRole; - } - - public Long getCompanyId() { - return companyId; - } - - public void setCompanyId(Long companyId) { - this.companyId = companyId; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } -} diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/user/UserSettingsBackendGetAll.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/user/UserSettingsBackendGetAll.java deleted file mode 100644 index 5271ef926..000000000 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/user/UserSettingsBackendGetAll.java +++ /dev/null @@ -1,52 +0,0 @@ -package ru.spcex.clearing.backendapi.controller.response.entity.user; - -import com.fasterxml.jackson.annotation.JsonProperty; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import ru.clearing.classes.statics.data.user.UserSettings; -import ru.spcex.clearing.backendapi.controller.response.BasicSpcexResponse; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -@ApiModel(description = "Ответ при получении объектов UserSetting.") -public class UserSettingsBackendGetAll extends BasicSpcexResponse { - - @JsonProperty - @ApiModelProperty(value = "Полезная нагрузка") - private UserSettingBackendPayload payload = new UserSettingBackendPayload(); - - private static class UserSettingBackendPayload { - private List items = new ArrayList<>(); - - public List getItems() { - return items; - } - - public void setItems(List items) { - this.items = items; - } - } - - public UserSettingBackendPayload getPayload() { - return payload; - } - - public void setPayload(UserSettingBackendPayload payload) { - this.payload = payload; - } - - public void fromEntity(Collection userSettings) { - var payload = this.getPayload(); - for (var userSetting : userSettings) { - var singleItem = new UserSettingsBackendGetFields(); - singleItem.setId(userSetting.getId()); - singleItem.setUserId(userSetting.getUserId()); - singleItem.setVersion(userSetting.getVersion()); - singleItem.setJson(userSetting.getJson()); - payload.getItems().add(singleItem); - } - } - -} \ No newline at end of file diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/user/UserSettingsBackendGetFields.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/user/UserSettingsBackendGetFields.java deleted file mode 100644 index 6793da1e0..000000000 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/user/UserSettingsBackendGetFields.java +++ /dev/null @@ -1,46 +0,0 @@ -package ru.spcex.clearing.backendapi.controller.response.entity.user; - -import com.fasterxml.jackson.annotation.JsonProperty; - -public class UserSettingsBackendGetFields { - @JsonProperty - private Long id; - @JsonProperty - private Long userId; - @JsonProperty - private String version; - @JsonProperty - private String json; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Long getUserId() { - return userId; - } - - public void setUserId(Long userId) { - this.userId = userId; - } - - public String getVersion() { - return version; - } - - public void setVersion(String version) { - this.version = version; - } - - public String getJson() { - return json; - } - - public void setJson(String json) { - this.json = json; - } -}