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

http://jira.mfd.msk:8088/browse/CLS-11

Browse source
This commit is contained in:
ialbert 2022-10-19 16:46:30 +03:00
parent 7ebbf89844
commit 216d28767d
5 changed files with 44 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/securitites/MoneyMarketSecurityNewRequest.java
View file

@ -3,19 +3,19 @@ package ru.spcex.clearing.platform.messaging.domain.cud.securitites;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import ru.spcex.clearing.platform.messaging.domain.json.deserialize.InstantDeserializer; import ru.spcex.clearing.platform.messaging.domain.json.deserialize.LocalDateDeserializer;
import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantSerializer; import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSerializer;
import java.time.LocalDate; import java.time.LocalDate;
public class MoneyMarketSecurityNewRequest { public class MoneyMarketSecurityNewRequest {
@JsonProperty @JsonProperty
@JsonSerialize(using = InstantSerializer.class) @JsonSerialize(using = LocalDateSerializer.class)
@JsonDeserialize(using = InstantDeserializer.class) @JsonDeserialize(using = LocalDateDeserializer.class)
public LocalDate startDate; public LocalDate startDate;
@JsonProperty @JsonProperty
@JsonSerialize(using = InstantSerializer.class) @JsonSerialize(using = LocalDateSerializer.class)
@JsonDeserialize(using = InstantDeserializer.class) @JsonDeserialize(using = LocalDateDeserializer.class)
public LocalDate endDate; public LocalDate endDate;
@JsonProperty @JsonProperty
public Double nominalValue; public Double nominalValue;

8
platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/securitites/MoneyMarketSecurityUpdateRequest.java
View file

@ -4,8 +4,8 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import ru.spcex.clearing.platform.messaging.domain.json.deserialize.InstantDeserializer; import ru.spcex.clearing.platform.messaging.domain.json.deserialize.LocalDateDeserializer;
import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantSerializer; import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSerializer;
import java.time.LocalDate; import java.time.LocalDate;
@ -13,8 +13,8 @@ public class MoneyMarketSecurityUpdateRequest {
@JsonProperty @JsonProperty
public Long id; public Long id;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "Europe/Moscow") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "Europe/Moscow")
@JsonSerialize(using = InstantSerializer.class) @JsonSerialize(using = LocalDateSerializer.class)
@JsonDeserialize(using = InstantDeserializer.class) @JsonDeserialize(using = LocalDateDeserializer.class)
@JsonProperty @JsonProperty
public LocalDate endDate; public LocalDate endDate;
@JsonProperty @JsonProperty

12
platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/utilities/KeyRateNewRequest.java
View file

@ -3,8 +3,8 @@ package ru.spcex.clearing.platform.messaging.domain.cud.utilities;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import ru.spcex.clearing.platform.messaging.domain.json.deserialize.InstantDeserializer; import ru.spcex.clearing.platform.messaging.domain.json.deserialize.LocalDateDeserializer;
import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantSerializer; import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSerializer;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDate; import java.time.LocalDate;
@ -12,12 +12,12 @@ import java.time.LocalDate;
public class KeyRateNewRequest { public class KeyRateNewRequest {
@JsonProperty @JsonProperty
public BigDecimal keyRate; public BigDecimal keyRate;
@JsonSerialize(using = InstantSerializer.class) @JsonSerialize(using = LocalDateSerializer.class)
@JsonDeserialize(using = InstantDeserializer.class) @JsonDeserialize(using = LocalDateDeserializer.class)
@JsonProperty @JsonProperty
public LocalDate startDate; public LocalDate startDate;
@JsonSerialize(using = InstantSerializer.class) @JsonSerialize(using = LocalDateSerializer.class)
@JsonDeserialize(using = InstantDeserializer.class) @JsonDeserialize(using = LocalDateDeserializer.class)
@JsonProperty @JsonProperty
public LocalDate endDate; public LocalDate endDate;
@JsonProperty @JsonProperty

12
platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/utilities/KeyRateUpdateRequest.java
View file

@ -3,8 +3,8 @@ package ru.spcex.clearing.platform.messaging.domain.cud.utilities;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import ru.spcex.clearing.platform.messaging.domain.json.deserialize.InstantDeserializer; import ru.spcex.clearing.platform.messaging.domain.json.deserialize.LocalDateDeserializer;
import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantSerializer; import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSerializer;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDate; import java.time.LocalDate;
@ -14,12 +14,12 @@ public class KeyRateUpdateRequest {
public Long id; public Long id;
@JsonProperty @JsonProperty
public BigDecimal keyRate; public BigDecimal keyRate;
@JsonSerialize(using = InstantSerializer.class) @JsonSerialize(using = LocalDateSerializer.class)
@JsonDeserialize(using = InstantDeserializer.class) @JsonDeserialize(using = LocalDateDeserializer.class)
@JsonProperty @JsonProperty
public LocalDate startDate; public LocalDate startDate;
@JsonSerialize(using = InstantSerializer.class) @JsonSerialize(using = LocalDateSerializer.class)
@JsonDeserialize(using = InstantDeserializer.class) @JsonDeserialize(using = LocalDateDeserializer.class)
@JsonProperty @JsonProperty
public LocalDate endDate; public LocalDate endDate;
@JsonProperty @JsonProperty

22
platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/json/deserialize/LocalDateDeserializer.java Normal file
View file

@ -0,0 +1,22 @@
package ru.spcex.clearing.platform.messaging.domain.json.deserialize;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
import java.io.IOException;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
public class LocalDateDeserializer extends JsonDeserializer<LocalDate> {
private static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
@Override
public LocalDate deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
String date = p.getText();
if (date == null || date.trim().length() == 0) {
return null;
}
return LocalDate.parse(date, formatter);
}
}