|
|
@@ -1,5 +1,6 @@
|
|
|
package com.zsElectric.boot.charging.service.impl;
|
|
|
|
|
|
+import com.fasterxml.jackson.databind.JsonNode;
|
|
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
|
|
import com.zsElectric.boot.charging.service.ChargingReceptionService;
|
|
|
import com.zsElectric.boot.charging.vo.*;
|
|
|
@@ -42,11 +43,14 @@ public class ChargingReceptionServiceImpl implements ChargingReceptionService {
|
|
|
if(verify(data, ConnectivityConstants.SIG_SECRET, requestDTO.getSig())){
|
|
|
String decryptData = chargingUtil.decryptData(requestDTO.getData());
|
|
|
log.info("解密后的数据:{}", decryptData);
|
|
|
- chargingStatusResponseVO = objectMapper.readValue(decryptData, ChargingStatusResponseVO.class);
|
|
|
+ JsonNode jsonNode = objectMapper.readTree(decryptData);
|
|
|
+// equipChargeStatusResponseVO = objectMapper.readValue(decryptData, EquipChargeStatusResponseVO.class);
|
|
|
//todo 业务代码待处理
|
|
|
|
|
|
|
|
|
- chargeResponseVO.setStartChargeSeq(chargingStatusResponseVO.getStartChargeSeq());
|
|
|
+
|
|
|
+ chargeResponseVO.setStartChargeSeq(jsonNode.get("StartChargeSeq").asText());
|
|
|
+// chargeResponseVO.setStartChargeSeq(equipChargeStatusResponseVO.getStartChargeSeq());
|
|
|
chargeResponseVO.setSuccStat(STATUS_OK);
|
|
|
chargeResponseVO.setFailReason(FAIL_REASON_NONE);
|
|
|
encryptData = chargingUtil.encryptData(objectMapper.writeValueAsString(chargeResponseVO));
|
|
|
@@ -80,12 +84,14 @@ public class ChargingReceptionServiceImpl implements ChargingReceptionService {
|
|
|
if(verify(data, ConnectivityConstants.SIG_SECRET, requestDTO.getSig())){
|
|
|
String decryptData = chargingUtil.decryptData(requestDTO.getData());
|
|
|
log.info("解密后的数据:{}", decryptData);
|
|
|
- equipChargeStatusResponseVO = objectMapper.readValue(decryptData, EquipChargeStatusResponseVO.class);
|
|
|
+ JsonNode jsonNode = objectMapper.readTree(decryptData);
|
|
|
+// equipChargeStatusResponseVO = objectMapper.readValue(decryptData, EquipChargeStatusResponseVO.class);
|
|
|
//todo 业务代码待处理
|
|
|
|
|
|
|
|
|
|
|
|
- chargeResponseVO.setStartChargeSeq(equipChargeStatusResponseVO.getStartChargeSeq());
|
|
|
+ chargeResponseVO.setStartChargeSeq(jsonNode.get("StartChargeSeq").asText());
|
|
|
+// chargeResponseVO.setStartChargeSeq(equipChargeStatusResponseVO.getStartChargeSeq());
|
|
|
chargeResponseVO.setSuccStat(STATUS_OK);
|
|
|
chargeResponseVO.setFailReason(FAIL_REASON_NONE);
|
|
|
encryptData = chargingUtil.encryptData(objectMapper.writeValueAsString(chargeResponseVO));
|
|
|
@@ -120,11 +126,14 @@ public class ChargingReceptionServiceImpl implements ChargingReceptionService {
|
|
|
if(verify(data, ConnectivityConstants.SIG_SECRET, requestDTO.getSig())){
|
|
|
String decryptData = chargingUtil.decryptData(requestDTO.getData());
|
|
|
log.info("解密后的数据:{}", decryptData);
|
|
|
- stopChargingResponseVO = objectMapper.readValue(decryptData, StopChargingResponseVO.class);
|
|
|
+ JsonNode jsonNode = objectMapper.readTree(decryptData);
|
|
|
+// equipChargeStatusResponseVO = objectMapper.readValue(decryptData, EquipChargeStatusResponseVO.class);
|
|
|
//todo 业务代码待处理
|
|
|
|
|
|
|
|
|
- chargeResponseVO.setStartChargeSeq(stopChargingResponseVO.getStartChargeSeq());
|
|
|
+
|
|
|
+ chargeResponseVO.setStartChargeSeq(jsonNode.get("StartChargeSeq").asText());
|
|
|
+// chargeResponseVO.setStartChargeSeq(equipChargeStatusResponseVO.getStartChargeSeq());
|
|
|
chargeResponseVO.setSuccStat(STATUS_OK);
|
|
|
chargeResponseVO.setFailReason(FAIL_REASON_NONE);
|
|
|
encryptData = chargingUtil.encryptData(objectMapper.writeValueAsString(chargeResponseVO));
|
|
|
@@ -159,11 +168,14 @@ public class ChargingReceptionServiceImpl implements ChargingReceptionService {
|
|
|
if(verify(data, ConnectivityConstants.SIG_SECRET, requestDTO.getSig())){
|
|
|
String decryptData = chargingUtil.decryptData(requestDTO.getData());
|
|
|
log.info("解密后的数据:{}", decryptData);
|
|
|
- chargingOrderVO = objectMapper.readValue(decryptData, ChargingOrderVO.class);
|
|
|
+ JsonNode jsonNode = objectMapper.readTree(decryptData);
|
|
|
+// equipChargeStatusResponseVO = objectMapper.readValue(decryptData, EquipChargeStatusResponseVO.class);
|
|
|
//todo 业务代码待处理
|
|
|
|
|
|
|
|
|
- chargeResponseVO.setStartChargeSeq(chargingOrderVO.getStartChargeSeq());
|
|
|
+
|
|
|
+ chargeResponseVO.setStartChargeSeq(jsonNode.get("StartChargeSeq").asText());
|
|
|
+// chargeResponseVO.setStartChargeSeq(equipChargeStatusResponseVO.getStartChargeSeq());
|
|
|
chargeResponseVO.setSuccStat(STATUS_OK);
|
|
|
chargeResponseVO.setFailReason(FAIL_REASON_NONE);
|
|
|
encryptData = chargingUtil.encryptData(objectMapper.writeValueAsString(chargeResponseVO));
|