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

query_equip_business_policy 修改参数格式

Browse Source
This commit is contained in:
ZZ 2021-10-27 11:32:18 +08:00
parent 1458ab860c
commit be14c7eeab
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,9 +12,9 @@ import lombok.Setter;
public class EquipBizRequest {
//将json当中的键值对为equipBizSeq的数据，封装到该属性中
@JsonProperty("equipBizSeq")
@JsonProperty("EquipBizSeq")
String equipBizSeq;
@JsonProperty("connectorId")
@JsonProperty("ConnectorID")
String connectorId;
}

10
evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryEquipBusinessPolicyController.java
View File

@ -1,11 +1,7 @@
package com.xhpc.evcs.api;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.xhpc.common.data.redis.CacheRateModel;
import com.xhpc.evcs.dto.CommonResponse;
import com.xhpc.evcs.dto.EquipBizRequest;
import com.xhpc.evcs.dto.EquipBizResponse;
import com.xhpc.evcs.dto.PolicyInfos;
import com.xhpc.evcs.dto.*;
import com.xhpc.evcs.jpa.XhpcTerminalRepository;
import com.xhpc.evcs.utils.JSONUtil;
import lombok.extern.slf4j.Slf4j;
@ -14,6 +10,7 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import java.io.IOException;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.HashMap;
@ -29,8 +26,9 @@ public class QueryEquipBusinessPolicyController {
private XhpcTerminalRepository xhpcTerminalRepository;
@PostMapping("/v1/query_equip_business_policy")
public CommonResponse queryEquipBusinessPolicy(@RequestBody EquipBizRequest equipBizRequest) throws JsonProcessingException {
public CommonResponse queryEquipBusinessPolicy(@RequestBody CommonRequest<EquipBizRequest> commonRequest) throws IOException {
//获取充电设备接口编码（枪编码）
EquipBizRequest equipBizRequest = JSONUtil.readParams(commonRequest.getData(), EquipBizRequest.class);
String connectorId = equipBizRequest.getConnectorId();
//获取枪所对应的桩编码
String bySerialNumber = xhpcTerminalRepository.selectBySql(connectorId);

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

@ -267,6 +267,7 @@ public class EvcsFilter extends OncePerRequestFilter {
InvalidKeyException {
byte[] buf = new byte[]{};
final String encin = request.getHeader("enc.in");
if ("POST".equalsIgnoreCase(request.getMethod())) {
if (request.getServletPath().endsWith("/query_token")) {
String encryptedMsg = commonRequest.getData();
@ -289,7 +290,7 @@ public class EvcsFilter extends OncePerRequestFilter {
String computedSig = HMAC.hmacDigest(
operatorIDNode.asText().concat(dataNode.asText()).concat(timestampNode.asText()).concat(seqNode.asText()),
authSecretToken.getSigSecret());
if (!computedSig.equals(sigNode.asText())) {
if (encin == null || encin.equals("true") && !computedSig.equals(sigNode.asText())) {
throw new InvalidAlgorithmParameterException("Illegal Sig, computed: ".concat(computedSig));
}
if (!dataNode.isNull()) {