yuyang/XH-Power-Cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WIP:三方对接逻辑

Browse Source
This commit is contained in:
ZZ 2021-11-10 12:13:12 +08:00
parent 3a56ab4fd1
commit 28893ec4a5
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/CDChargeOrderInfo4BonusReq.java
View File

@ -104,7 +104,7 @@ public class CDChargeOrderInfo4BonusReq {
this.equipmentId = xhpcHistoryOrder.getSerialNumber().substring(0, 14); this.equipmentId = xhpcHistoryOrder.getSerialNumber().substring(0, 14);
this.connectorPower = xhpcHistoryOrder.getConnectorPowerEvcs(); this.connectorPower = xhpcHistoryOrder.getConnectorPowerEvcs();
Date starttime = xhpcHistoryOrder.getStartTime(); Date starttime = xhpcHistoryOrder.getStartTime();
Date endtime = xhpcHistoryOrder.getCreateTime(); Date endtime = xhpcHistoryOrder.getEndTime();
int cl = 0; int cl = 0;
if (starttime != null && endtime != null) { if (starttime != null && endtime != null) {
cl = Math.toIntExact((endtime.getTime() - starttime.getTime()) / 1000); cl = Math.toIntExact((endtime.getTime() - starttime.getTime()) / 1000);

4
evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/QueryStopChargeRequest.java
View File

@ -11,9 +11,9 @@ import lombok.Setter;
setterVisibility = JsonAutoDetect.Visibility.NONE, creatorVisibility = JsonAutoDetect.Visibility.NONE) setterVisibility = JsonAutoDetect.Visibility.NONE, creatorVisibility = JsonAutoDetect.Visibility.NONE)
public class QueryStopChargeRequest { public class QueryStopChargeRequest {
@JsonProperty("startChargeSeq") @JsonProperty("StartChargeSeq")
String startChargeSeq; String startChargeSeq;
@JsonProperty("connectorId") @JsonProperty("ConnectorID")
String connectorId; String connectorId;
} }

4
evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/config/EvcsFilter.java
View File

@ -230,7 +230,7 @@ public class EvcsFilter extends OncePerRequestFilter {
sigSecret); sigSecret);
commonRequest.setSig(sig); commonRequest.setSig(sig);
final String jsonString = JSONUtil.toJSONString(commonRequest); final String jsonString = JSONUtil.toJSONString(commonRequest);
log.debug("enc to out:{} ", jsonString); // log.debug("enc to out:{} ", jsonString);
return jsonString; return jsonString;
} }
@ -266,7 +266,7 @@ public class EvcsFilter extends OncePerRequestFilter {
} }
String sig = HMAC.hmacDigest(rootNode.path("Ret").asText() + rootNode.path("Msg").asText() + data, sigSecret); String sig = HMAC.hmacDigest(rootNode.path("Ret").asText() + rootNode.path("Msg").asText() + data, sigSecret);
((ObjectNode) rootNode).put("Sig", sig); ((ObjectNode) rootNode).put("Sig", sig);
log.debug("enc to out: " + rootNode); // log.debug("enc to out: " + rootNode);
return rootNode; return rootNode;
} }