From dab1aeabc080276d0d451196c190e864e3cee098 Mon Sep 17 00:00:00 2001 From: ZZ Date: Tue, 16 Nov 2021 18:25:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=AA=E6=8E=A8=E7=BB=99=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E7=9A=84=E7=AC=AC=E4=B8=89=E6=96=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NotificationEquipChargeStatusTask.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 38c60d47..51a17331 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 @@ -51,7 +51,6 @@ public class NotificationEquipChargeStatusTask extends CoreDispatcher { List authSecretTokenOutList = authSecretTokenRepository.findBySecretTokenType(SECRET_TOKEN_TYPE_OUT); final Collection gunkeys = REDIS.keys("gun:*"); for (AuthSecretToken authSecretToken : authSecretTokenOutList) { - for (String gunkey : gunkeys) { if (!gunkey.endsWith(".seqdec") && !gunkey.endsWith(".seqhex") && !gunkey.endsWith(".hori")) { final Map cacheGun = REDIS.getCacheMap(gunkey); @@ -59,8 +58,10 @@ public class NotificationEquipChargeStatusTask extends CoreDispatcher { if (isInteger(status)) { final String orderkey = cacheGun.get("orderkey").toString(); EquipChargeStatus equipChargeStatus = new EquipChargeStatus(); - equipChargeStatus.setStartChargeSeq(REDIS.getCacheMapValue(orderkey.replace("order:", "pushOrder:"), - "internetSerialNumber")); + final String internetSerialNumber = REDIS.getCacheMapValue(orderkey.replace("order:", "pushOrder:"), + "internetSerialNumber"); + if (!internetSerialNumber.startsWith(authSecretToken.getOperatorId3irdpty())) continue; + equipChargeStatus.setStartChargeSeq(internetSerialNumber); equipChargeStatus.setStartChargeSeqStat(2); equipChargeStatus.setConnectorID(orderkey.substring(6, 22)); String current = REDIS.getCacheMapValue(gunkey, "current"); @@ -204,8 +205,7 @@ public class NotificationEquipChargeStatusTask extends CoreDispatcher { EquipChargeStatusRes equipChargeStatusRes = DTOJsonHelper.parseResponseData(responseBody, EquipChargeStatusRes.class, authSecretTokenOut); if (equipChargeStatusRes != null && equipChargeStatusRes.getSuccStat() != 0) { - throw new RuntimeException(String.format("push equipment order status [%s] failed: %s", - equipChargeStatus.getStartChargeSeq(), responseBody)); + logger.error("push equipment order status [%s] failed: %s", equipChargeStatus.getStartChargeSeq(), responseBody); } }