From 72aece098f467cf95a79ba40eeef9e6158a0351d Mon Sep 17 00:00:00 2001 From: ZZ Date: Wed, 24 Nov 2021 15:58:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E6=98=AF=E4=B8=89=E6=96=B9=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E4=B8=8D=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NotificationStopChargeResultTask.java | 45 ++++++++++--------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationStopChargeResultTask.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationStopChargeResultTask.java index de0cecd8..c7539b5d 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationStopChargeResultTask.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationStopChargeResultTask.java @@ -8,6 +8,7 @@ import com.xhpc.evcs.dto.CommonRequest; import com.xhpc.evcs.dto.DTOJsonHelper; import com.xhpc.evcs.jpa.AuthSecretTokenRepository; import com.xhpc.evcs.utils.JSONUtil; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -18,6 +19,7 @@ import java.util.Map; import static com.xhpc.common.data.redis.StaticBeanUtil.REDIS; import static com.xhpc.evcs.domain.AuthSecretToken.SECRET_TOKEN_TYPE_OUT; +@Slf4j @Component public class NotificationStopChargeResultTask extends CoreDispatcher { @@ -55,28 +57,29 @@ public class NotificationStopChargeResultTask extends CoreDispatcher { Boolean isStopNotified = (Boolean) pushOrder.get("isStopNotified"); if (isStopNotified == null || !isStopNotified) { String internetSerialNumber = (String) pushOrder.get("internetSerialNumber"); - if (internetSerialNumber != null) { - String operatorId3rdpty = internetSerialNumber.substring(0, 9); - AuthSecretToken authSecretTokenOut = - authSecretTokenRepository.findByOperatorId3irdptyAndSecretTokenType(operatorId3rdpty, - SECRET_TOKEN_TYPE_OUT).orElse(null); - CommonRequest commonRequest = new CommonRequest<>(); - ChargeResultRequest chargeResultRequest = new ChargeResultRequest(); - chargeResultRequest.setStartChargeSeq(internetSerialNumber); - //使用指定包装类封装数据 - chargeResultRequest.setConnectorID(orderkey.substring(0, 16)); - chargeResultRequest.setStartChargeSeqStat(4); - chargeResultRequest.setSuccStat(0); - chargeResultRequest.setFailReason(3); - //将其转换为json - String jsonData = JSONUtil.toJSONString(chargeResultRequest); - commonRequest.setData(jsonData); - String result = ok(commonRequest, "/notification_stop_charge_result", authSecretTokenOut); - ChargeResultResponse chargeResultResponse = DTOJsonHelper.parseResponseData(result, - ChargeResultResponse.class, authSecretTokenOut); - pushOrder.put("isStopNotified", true); - REDIS.setCacheMap(pushOrderKey, pushOrder); + if (internetSerialNumber == null) { + log.error("null isn: {}", pushOrderKey); } + String operatorId3rdpty = internetSerialNumber.substring(0, 9); + AuthSecretToken authSecretTokenOut = + authSecretTokenRepository.findByOperatorId3irdptyAndSecretTokenType(operatorId3rdpty, + SECRET_TOKEN_TYPE_OUT).orElse(null); + CommonRequest commonRequest = new CommonRequest<>(); + ChargeResultRequest chargeResultRequest = new ChargeResultRequest(); + chargeResultRequest.setStartChargeSeq(internetSerialNumber); + //使用指定包装类封装数据 + chargeResultRequest.setConnectorID(orderkey.substring(0, 16)); + chargeResultRequest.setStartChargeSeqStat(4); + chargeResultRequest.setSuccStat(0); + chargeResultRequest.setFailReason(3); + //将其转换为json + String jsonData = JSONUtil.toJSONString(chargeResultRequest); + commonRequest.setData(jsonData); + String result = ok(commonRequest, "/notification_stop_charge_result", authSecretTokenOut); + ChargeResultResponse chargeResultResponse = DTOJsonHelper.parseResponseData(result, + ChargeResultResponse.class, authSecretTokenOut); + pushOrder.put("isStopNotified", true); + REDIS.setCacheMap(pushOrderKey, pushOrder); } } }