From b7364f8c36a373f47424f63a25db21e563fb4f94 Mon Sep 17 00:00:00 2001 From: zz Date: Fri, 19 Nov 2021 17:02:03 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E6=9C=AA=E7=9F=A5?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=85=BC=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xhpc/evcs/dto/ConnectorStatusInfoReq.java | 39 ++++++++-- ...ificationStartChargeResultRequestData.java | 22 +++++- .../evcs/dto/NotifyNoBillOrderRequest.java | 73 +++++++++++++++++-- .../xhpc/evcs/dto/QueryStopChargeRequest.java | 49 +++++++++++-- .../xhpc/evcs/dto/StationStatusRequest.java | 37 ++++++++-- 5 files changed, 191 insertions(+), 29 deletions(-) diff --git a/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/ConnectorStatusInfoReq.java b/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/ConnectorStatusInfoReq.java index bb0fa7a4..334281bb 100644 --- a/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/ConnectorStatusInfoReq.java +++ b/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/ConnectorStatusInfoReq.java @@ -1,15 +1,11 @@ package com.xhpc.evcs.dto; -import com.fasterxml.jackson.annotation.JsonAutoDetect; -import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.Data; -import lombok.Getter; -import lombok.Setter; +import com.fasterxml.jackson.annotation.*; + +import java.util.HashMap; +import java.util.Map; -@Setter -@Getter -@Data @JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, getterVisibility = JsonAutoDetect.Visibility.NONE, setterVisibility = JsonAutoDetect.Visibility.NONE, creatorVisibility = JsonAutoDetect.Visibility.NONE) public class ConnectorStatusInfoReq { @@ -17,4 +13,31 @@ public class ConnectorStatusInfoReq { @JsonProperty("ConnectorStatusInfo") private ConnectorStatusInfo connectorStatusInfo; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + @JsonProperty("ConnectorStatusInfo") + public ConnectorStatusInfo getConnectorStatusInfo() { + + return connectorStatusInfo; + } + + @JsonProperty("ConnectorStatusInfo") + public void setConnectorStatusInfo(ConnectorStatusInfo connectorStatusInfo) { + + this.connectorStatusInfo = connectorStatusInfo; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + + this.additionalProperties.put(name, value); + } + } diff --git a/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/NotificationStartChargeResultRequestData.java b/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/NotificationStartChargeResultRequestData.java index 81d5499e..6243dded 100644 --- a/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/NotificationStartChargeResultRequestData.java +++ b/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/NotificationStartChargeResultRequestData.java @@ -1,10 +1,11 @@ package com.xhpc.evcs.dto; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.*; import org.apache.commons.lang3.builder.ToStringBuilder; +import java.util.HashMap; +import java.util.Map; + @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ "StartChargeSeq", @@ -87,6 +88,21 @@ public class NotificationStartChargeResultRequestData { } + @JsonIgnore + private Map additionalProperties = new HashMap(); + + @JsonAnyGetter + public Map getAdditionalProperties() { + + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + + this.additionalProperties.put(name, value); + } + @Override public String toString() { diff --git a/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/NotifyNoBillOrderRequest.java b/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/NotifyNoBillOrderRequest.java index 7c5aa5cc..661aa3a0 100644 --- a/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/NotifyNoBillOrderRequest.java +++ b/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/NotifyNoBillOrderRequest.java @@ -1,12 +1,10 @@ package com.xhpc.evcs.dto; -import com.fasterxml.jackson.annotation.JsonAutoDetect; -import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.Getter; -import lombok.Setter; +import com.fasterxml.jackson.annotation.*; + +import java.util.HashMap; +import java.util.Map; -@Getter -@Setter @JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, getterVisibility = JsonAutoDetect.Visibility.NONE, setterVisibility = JsonAutoDetect.Visibility.NONE, creatorVisibility = JsonAutoDetect.Visibility.NONE) public class NotifyNoBillOrderRequest { @@ -23,4 +21,67 @@ public class NotifyNoBillOrderRequest { @JsonProperty("OrderETime") String orderETime; + @JsonProperty("StartChargeSeq") + public String getStartChargeSeq() { + + return startChargeSeq; + } + + @JsonProperty("StartChargeSeq") + public void setStartChargeSeq(String startChargeSeq) { + + this.startChargeSeq = startChargeSeq; + } + + @JsonProperty("OperatorID") + public String getOperatorId() { + + return operatorId; + } + + @JsonProperty("OperatorID") + public void setOperatorId(String operatorId) { + + this.operatorId = operatorId; + } + + @JsonProperty("ConnectorID") + public String getConnectorId() { + + return connectorId; + } + + @JsonProperty("ConnectorID") + public void setConnectorId(String connectorId) { + + this.connectorId = connectorId; + } + + @JsonProperty("OrderETime") + public String getOrderETime() { + + return orderETime; + } + + @JsonProperty("OrderETime") + public void setOrderETime(String orderETime) { + + this.orderETime = orderETime; + } + + @JsonIgnore + private Map additionalProperties = new HashMap(); + + @JsonAnyGetter + public Map getAdditionalProperties() { + + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + + this.additionalProperties.put(name, value); + } + } diff --git a/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/QueryStopChargeRequest.java b/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/QueryStopChargeRequest.java index 32857d95..853f4ee1 100644 --- a/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/QueryStopChargeRequest.java +++ b/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/QueryStopChargeRequest.java @@ -1,12 +1,10 @@ package com.xhpc.evcs.dto; -import com.fasterxml.jackson.annotation.JsonAutoDetect; -import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.Getter; -import lombok.Setter; +import com.fasterxml.jackson.annotation.*; + +import java.util.HashMap; +import java.util.Map; -@Getter -@Setter @JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, getterVisibility = JsonAutoDetect.Visibility.NONE, setterVisibility = JsonAutoDetect.Visibility.NONE, creatorVisibility = JsonAutoDetect.Visibility.NONE) public class QueryStopChargeRequest { @@ -16,4 +14,43 @@ public class QueryStopChargeRequest { @JsonProperty("ConnectorID") String connectorId; + @JsonProperty("StartChargeSeq") + public String getStartChargeSeq() { + + return startChargeSeq; + } + + @JsonProperty("StartChargeSeq") + public void setStartChargeSeq(String startChargeSeq) { + + this.startChargeSeq = startChargeSeq; + } + + @JsonProperty("ConnectorID") + public String getConnectorId() { + + return connectorId; + } + + @JsonProperty("ConnectorID") + public void setConnectorId(String connectorId) { + + this.connectorId = connectorId; + } + + @JsonIgnore + private Map additionalProperties = new HashMap(); + + @JsonAnyGetter + public Map getAdditionalProperties() { + + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + + this.additionalProperties.put(name, value); + } + } diff --git a/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/StationStatusRequest.java b/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/StationStatusRequest.java index fbc37f72..595f669c 100644 --- a/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/StationStatusRequest.java +++ b/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/StationStatusRequest.java @@ -1,17 +1,42 @@ package com.xhpc.evcs.dto; -import com.fasterxml.jackson.annotation.JsonAutoDetect; -import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.Getter; -import lombok.Setter; +import com.fasterxml.jackson.annotation.*; -@Getter -@Setter +import java.util.HashMap; +import java.util.Map; + +@JsonInclude(JsonInclude.Include.NON_NULL) @JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, getterVisibility = JsonAutoDetect.Visibility.NONE, setterVisibility = JsonAutoDetect.Visibility.NONE, creatorVisibility = JsonAutoDetect.Visibility.NONE) public class StationStatusRequest { @JsonProperty("StationIDs") String[] stationIds; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + @JsonAnyGetter + public Map getAdditionalProperties() { + + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + + this.additionalProperties.put(name, value); + } + + @JsonProperty("StationIDs") + public String[] getStationIds() { + + return stationIds; + } + + @JsonProperty("StationIDs") + public void setStationIds(String[] stationIds) { + + this.stationIds = stationIds; + } }