From 5ce80723fd72c21944e0bbc2993cc5611b7eaad1 Mon Sep 17 00:00:00 2001 From: ZZ Date: Thu, 18 Nov 2021 17:21:04 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=99=E8=AF=AF=E5=A4=84=E7=90=86=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xhpc/evcs/dto/DTOJsonHelper.java | 3 +-- .../evcs/notification/NotificationEquipChargeStatusTask.java | 5 ++++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/DTOJsonHelper.java b/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/DTOJsonHelper.java index 9e489cab..1e39e48f 100644 --- a/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/DTOJsonHelper.java +++ b/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/DTOJsonHelper.java @@ -43,8 +43,7 @@ public class DTOJsonHelper { } } catch (Exception e) { String msg = e.getMessage(); - log.error(msg); - throw new ServerInternalException(msg); + log.error("×operator3rdpty[{}]: {}", authSecretToken.getOperatorId3irdpty(), msg); } } return null; diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationEquipChargeStatusTask.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationEquipChargeStatusTask.java index 78a6cb6b..fea2ae38 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationEquipChargeStatusTask.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationEquipChargeStatusTask.java @@ -60,7 +60,10 @@ public class NotificationEquipChargeStatusTask extends CoreDispatcher { EquipChargeStatus equipChargeStatus = new EquipChargeStatus(); final String internetSerialNumber = REDIS.getCacheMapValue(orderkey.replace("order:", "pushOrder:"), "internetSerialNumber"); - if (!internetSerialNumber.startsWith(authSecretToken.getOperatorId3irdpty())) continue; + if (internetSerialNumber == null || !internetSerialNumber.startsWith(authSecretToken.getOperatorId3irdpty())) { + logger.error("order[{}] got no ISN: {} ", orderkey, internetSerialNumber); + continue; + } equipChargeStatus.setStartChargeSeq(internetSerialNumber); equipChargeStatus.setStartChargeSeqStat(2); equipChargeStatus.setConnectorID(orderkey.substring(6, 22));