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.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 {
@JsonProperty
@ -14,8 +14,8 @@ public class ProfileDocumentBackendGetFields {
@JsonProperty
private String documentType;
@JsonProperty
@JsonSerialize(using = InstantSerializer.class)
private Instant issueDate;
@JsonSerialize(using = LocalDateSerializer.class)
private LocalDate issueDate;
@JsonProperty
private String issuePlace;
@JsonProperty
@ -29,11 +29,11 @@ public class ProfileDocumentBackendGetFields {
@JsonProperty
private String place;
@JsonProperty
@JsonSerialize(using = InstantSerializer.class)
private Instant validFromDate;
@JsonSerialize(using = LocalDateSerializer.class)
private LocalDate validFromDate;
@JsonProperty
@JsonSerialize(using = InstantSerializer.class)
private Instant validToDate;
@JsonSerialize(using = LocalDateSerializer.class)
private LocalDate validToDate;
@JsonProperty
private String link;
@ -61,11 +61,11 @@ public class ProfileDocumentBackendGetFields {
this.documentType = documentType;
}
public Instant getIssueDate() {
public LocalDate getIssueDate() {
return issueDate;
}
public void setIssueDate(Instant issueDate) {
public void setIssueDate(LocalDate issueDate) {
this.issueDate = issueDate;
}
@ -117,19 +117,19 @@ public class ProfileDocumentBackendGetFields {
this.place = place;
}
public Instant getValidFromDate() {
public LocalDate getValidFromDate() {
return validFromDate;
}
public void setValidFromDate(Instant validFromDate) {
public void setValidFromDate(LocalDate validFromDate) {
this.validFromDate = validFromDate;
}
public Instant getValidToDate() {
public LocalDate getValidToDate() {
return validToDate;
}
public void setValidToDate(Instant validToDate) {
public void setValidToDate(LocalDate 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.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 {
@JsonProperty
@ -12,11 +14,11 @@ public class SchedulerAllTodayBackendGetFields {
@JsonProperty
private String task;
@JsonProperty
@JsonSerialize(using = InstantSerializer.class)
private Instant taskTime;
@JsonSerialize(using = LocalTimeSerializer.class)
private LocalTime taskTime;
@JsonProperty
@JsonSerialize(using = InstantSerializer.class)
private Instant clearingDate;
@JsonSerialize(using = LocalDateSerializer.class)
private LocalDate clearingDate;
@JsonProperty
private String market;
@JsonProperty
@ -44,19 +46,19 @@ public class SchedulerAllTodayBackendGetFields {
this.task = task;
}
public Instant getTaskTime() {
public LocalTime getTaskTime() {
return taskTime;
}
public void setTaskTime(Instant taskTime) {
public void setTaskTime(LocalTime taskTime) {
this.taskTime = taskTime;
}
public Instant getClearingDate() {
public LocalDate getClearingDate() {
return clearingDate;
}
public void setClearingDate(Instant clearingDate) {
public void setClearingDate(LocalDate 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.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
@ -12,11 +16,11 @@ public class SchedulerBackendGetFields {
@JsonProperty
private String task;
@JsonProperty
@JsonSerialize(using = InstantSerializer.class)
private Instant taskTime;
@JsonSerialize(using = LocalTimeSerializer.class)
private LocalTime taskTime;
@JsonProperty
@JsonSerialize(using = InstantSerializer.class)
private Instant clearingDate;
@JsonSerialize(using = LocalDateSerializer.class)
private LocalDate clearingDate;
@JsonProperty
private String market;
@JsonProperty
@ -46,19 +50,19 @@ public class SchedulerBackendGetFields {
this.task = task;
}
public Instant getTaskTime() {
public LocalTime getTaskTime() {
return taskTime;
}
public void setTaskTime(Instant taskTime) {
public void setTaskTime(LocalTime taskTime) {
this.taskTime = taskTime;
}
public Instant getClearingDate() {
public LocalDate getClearingDate() {
return clearingDate;
}
public void setClearingDate(Instant clearingDate) {
public void setClearingDate(LocalDate 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.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
@ -12,8 +14,8 @@ public class TimetableBackendGetFields {
@JsonProperty
private String task;
@JsonProperty
@JsonSerialize(using = InstantSerializer.class)
private Instant taskTime;
@JsonSerialize(using = LocalTimeSerializer.class)
private LocalTime taskTime;
@JsonProperty
private String taskStatus;
@JsonProperty
@ -39,11 +41,11 @@ public class TimetableBackendGetFields {
this.task = task;
}
public Instant getTaskTime() {
public LocalTime getTaskTime() {
return taskTime;
}
public void setTaskTime(Instant taskTime) {
public void setTaskTime(LocalTime 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.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;
@ -11,8 +12,8 @@ public class TradingCalendarBackendGetFields {
@JsonProperty
private Long id;
@JsonProperty
@JsonSerialize(using = InstantSerializer.class)
private Instant clearingDate;
@JsonSerialize(using = LocalDateSerializer.class)
private LocalDate clearingDate;
@JsonProperty
private Long companyId;
@JsonProperty
@ -22,7 +23,7 @@ public class TradingCalendarBackendGetFields {
private Instant created;
@JsonProperty
@JsonSerialize(using = InstantSerializer.class)
private LocalDate updated;
private Instant updated;
public Long getId() {
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 java.math.BigDecimal;
import java.time.Instant;
import java.time.LocalDate;
public class MoneyMarketSecurityBackendGetFields {
@ -56,7 +55,7 @@ public class MoneyMarketSecurityBackendGetFields {
this.description = description;
}
public Instant getStartDate() {
public LocalDate getStartDate() {
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));
}
}