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

fix dates

Browse source
This commit is contained in:
ialbert 2022-10-14 14:45:54 +03:00
parent 72667e5dec
commit b7cbcbbe54
8 changed files with 89 additions and 41 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/company/ProfileDocumentBackendGetFields.java
View file

@ -2,9 +2,9 @@ package ru.spcex.clearing.backendapi.controller.response.entity.company;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; 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 ProfileDocumentBackendGetFields { public class ProfileDocumentBackendGetFields {
@JsonProperty @JsonProperty
@ -14,8 +14,8 @@ public class ProfileDocumentBackendGetFields {
@JsonProperty @JsonProperty
private String documentType; private String documentType;
@JsonProperty @JsonProperty
@JsonSerialize(using = InstantSerializer.class) @JsonSerialize(using = LocalDateSerializer.class)
private Instant issueDate; private LocalDate issueDate;
@JsonProperty @JsonProperty
private String issuePlace; private String issuePlace;
@JsonProperty @JsonProperty
@ -29,11 +29,11 @@ public class ProfileDocumentBackendGetFields {
@JsonProperty @JsonProperty
private String place; private String place;
@JsonProperty @JsonProperty
@JsonSerialize(using = InstantSerializer.class) @JsonSerialize(using = LocalDateSerializer.class)
private Instant validFromDate; private LocalDate validFromDate;
@JsonProperty @JsonProperty
@JsonSerialize(using = InstantSerializer.class) @JsonSerialize(using = LocalDateSerializer.class)
private Instant validToDate; private LocalDate validToDate;
@JsonProperty @JsonProperty
private String link; private String link;
@ -61,11 +61,11 @@ public class ProfileDocumentBackendGetFields {
this.documentType = documentType; this.documentType = documentType;
} }
public Instant getIssueDate() { public LocalDate getIssueDate() {
return issueDate; return issueDate;
} }
public void setIssueDate(Instant issueDate) { public void setIssueDate(LocalDate issueDate) {
this.issueDate = issueDate; this.issueDate = issueDate;
} }
@ -117,19 +117,19 @@ public class ProfileDocumentBackendGetFields {
this.place = place; this.place = place;
} }
public Instant getValidFromDate() { public LocalDate getValidFromDate() {
return validFromDate; return validFromDate;
} }
public void setValidFromDate(Instant validFromDate) { public void setValidFromDate(LocalDate validFromDate) {
this.validFromDate = validFromDate; this.validFromDate = validFromDate;
} }
public Instant getValidToDate() { public LocalDate getValidToDate() {
return validToDate; return validToDate;
} }
public void setValidToDate(Instant validToDate) { public void setValidToDate(LocalDate validToDate) {
this.validToDate = validToDate; this.validToDate = validToDate;
} }

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

@ -2,9 +2,11 @@ package ru.spcex.clearing.backendapi.controller.response.entity.schedule;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; 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 SchedulerAllTodayBackendGetFields { public class SchedulerAllTodayBackendGetFields {
@JsonProperty @JsonProperty
@ -12,11 +14,11 @@ public class SchedulerAllTodayBackendGetFields {
@JsonProperty @JsonProperty
private String task; private String task;
@JsonProperty @JsonProperty
@JsonSerialize(using = InstantSerializer.class) @JsonSerialize(using = LocalTimeSerializer.class)
private Instant taskTime; private LocalTime taskTime;
@JsonProperty @JsonProperty
@JsonSerialize(using = InstantSerializer.class) @JsonSerialize(using = LocalDateSerializer.class)
private Instant clearingDate; private LocalDate clearingDate;
@JsonProperty @JsonProperty
private String market; private String market;
@JsonProperty @JsonProperty
@ -44,19 +46,19 @@ public class SchedulerAllTodayBackendGetFields {
this.task = task; this.task = task;
} }
public Instant getTaskTime() { public LocalTime getTaskTime() {
return taskTime; return taskTime;
} }
public void setTaskTime(Instant taskTime) { public void setTaskTime(LocalTime taskTime) {
this.taskTime = taskTime; this.taskTime = taskTime;
} }
public Instant getClearingDate() { public LocalDate getClearingDate() {
return clearingDate; return clearingDate;
} }
public void setClearingDate(Instant clearingDate) { public void setClearingDate(LocalDate clearingDate) {
this.clearingDate = clearingDate; this.clearingDate = clearingDate;
} }

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

@ -3,8 +3,12 @@ package ru.spcex.clearing.backendapi.controller.response.entity.schedule;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; 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.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.Instant;
import java.time.LocalDate;
import java.time.LocalTime;
public class SchedulerBackendGetFields { public class SchedulerBackendGetFields {
@JsonProperty @JsonProperty
@ -12,11 +16,11 @@ public class SchedulerBackendGetFields {
@JsonProperty @JsonProperty
private String task; private String task;
@JsonProperty @JsonProperty
@JsonSerialize(using = InstantSerializer.class) @JsonSerialize(using = LocalTimeSerializer.class)
private Instant taskTime; private LocalTime taskTime;
@JsonProperty @JsonProperty
@JsonSerialize(using = InstantSerializer.class) @JsonSerialize(using = LocalDateSerializer.class)
private Instant clearingDate; private LocalDate clearingDate;
@JsonProperty @JsonProperty
private String market; private String market;
@JsonProperty @JsonProperty
@ -46,19 +50,19 @@ public class SchedulerBackendGetFields {
this.task = task; this.task = task;
} }
public Instant getTaskTime() { public LocalTime getTaskTime() {
return taskTime; return taskTime;
} }
public void setTaskTime(Instant taskTime) { public void setTaskTime(LocalTime taskTime) {
this.taskTime = taskTime; this.taskTime = taskTime;
} }
public Instant getClearingDate() { public LocalDate getClearingDate() {
return clearingDate; return clearingDate;
} }
public void setClearingDate(Instant clearingDate) { public void setClearingDate(LocalDate clearingDate) {
this.clearingDate = clearingDate; this.clearingDate = clearingDate;
} }

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

@ -3,8 +3,10 @@ package ru.spcex.clearing.backendapi.controller.response.entity.schedule;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; 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.InstantSerializer;
import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalTimeSerializer;
import java.time.Instant; import java.time.Instant;
import java.time.LocalTime;
public class TimetableBackendGetFields { public class TimetableBackendGetFields {
@JsonProperty @JsonProperty
@ -12,8 +14,8 @@ public class TimetableBackendGetFields {
@JsonProperty @JsonProperty
private String task; private String task;
@JsonProperty @JsonProperty
@JsonSerialize(using = InstantSerializer.class) @JsonSerialize(using = LocalTimeSerializer.class)
private Instant taskTime; private LocalTime taskTime;
@JsonProperty @JsonProperty
private String taskStatus; private String taskStatus;
@JsonProperty @JsonProperty
@ -39,11 +41,11 @@ public class TimetableBackendGetFields {
this.task = task; this.task = task;
} }
public Instant getTaskTime() { public LocalTime getTaskTime() {
return taskTime; return taskTime;
} }
public void setTaskTime(Instant taskTime) { public void setTaskTime(LocalTime taskTime) {
this.taskTime = taskTime; this.taskTime = taskTime;
} }

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

@ -3,6 +3,7 @@ package ru.spcex.clearing.backendapi.controller.response.entity.schedule;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; 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.InstantSerializer;
import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSerializer;
import java.time.Instant; import java.time.Instant;
import java.time.LocalDate; import java.time.LocalDate;
@ -11,8 +12,8 @@ public class TradingCalendarBackendGetFields {
@JsonProperty @JsonProperty
private Long id; private Long id;
@JsonProperty @JsonProperty
@JsonSerialize(using = InstantSerializer.class) @JsonSerialize(using = LocalDateSerializer.class)
private Instant clearingDate; private LocalDate clearingDate;
@JsonProperty @JsonProperty
private Long companyId; private Long companyId;
@JsonProperty @JsonProperty
@ -22,7 +23,7 @@ public class TradingCalendarBackendGetFields {
private Instant created; private Instant created;
@JsonProperty @JsonProperty
@JsonSerialize(using = InstantSerializer.class) @JsonSerialize(using = InstantSerializer.class)
private LocalDate updated; private Instant updated;
public Long getId() { public Long getId() {
return id; return id;

3
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/securities/MoneyMarketSecurityBackendGetFields.java
View file

@ -5,7 +5,6 @@ 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.InstantSerializer;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.Instant;
import java.time.LocalDate; import java.time.LocalDate;
public class MoneyMarketSecurityBackendGetFields { public class MoneyMarketSecurityBackendGetFields {
@ -56,7 +55,7 @@ public class MoneyMarketSecurityBackendGetFields {
this.description = description; this.description = description;
} }
public Instant getStartDate() { public LocalDate getStartDate() {
return startDate; return startDate;
} }

20
platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/json/serialize/LocalDateSerializer.java Normal file
View file

@ -0,0 +1,20 @@
package ru.spcex.clearing.platform.messaging.domain.json.serialize;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializerProvider;
import java.io.IOException;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
public class LocalDateSerializer extends JsonSerializer<LocalDate> {
private static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
@Override
public void serialize(LocalDate value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
if (value == null) return;
gen.writeString(value.format(formatter));
}
}

20
platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/json/serialize/LocalTimeSerializer.java Normal file
View file

@ -0,0 +1,20 @@
package ru.spcex.clearing.platform.messaging.domain.json.serialize;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializerProvider;
import java.io.IOException;
import java.time.LocalTime;
import java.time.format.DateTimeFormatter;
public class LocalTimeSerializer extends JsonSerializer<LocalTime> {
private static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("HH:mm:ss");
@Override
public void serialize(LocalTime value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
if (value == null) return;
gen.writeString(value.format(formatter));
}
}