From 343a45b2ee4d03b503cb2fc2729185af4b08e736 Mon Sep 17 00:00:00 2001 From: ZZ Date: Mon, 22 Nov 2021 18:02:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=A2=E5=BC=83=E7=AB=99=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E7=BB=93=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NotificationStationStatusTask.java | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationStationStatusTask.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationStationStatusTask.java index 47349b44..1d458b8e 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationStationStatusTask.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationStationStatusTask.java @@ -4,7 +4,9 @@ import com.xhpc.common.api.dto.ChargingStationDto; import com.xhpc.evcs.domain.AuthSecretToken; import com.xhpc.evcs.domain.XhpcInternetUser; import com.xhpc.evcs.domain.XhpcStationInternetBlacklist; -import com.xhpc.evcs.dto.*; +import com.xhpc.evcs.dto.CommonRequest; +import com.xhpc.evcs.dto.ConnectorStatusInfo; +import com.xhpc.evcs.dto.ConnectorStatusInfoReq; import com.xhpc.evcs.jpa.AuthSecretTokenRepository; import com.xhpc.evcs.jpa.XhpcInternetUserRepository; import com.xhpc.evcs.jpa.XhpcStationInternetBlacklistRepository; @@ -49,7 +51,7 @@ public class NotificationStationStatusTask extends CoreDispatcher { Map terminalStatusMap = REDIS.getCacheMap(stationTerminalKey); Set connectorStatusInfos = translateStatus(operatorId, terminalStatusMap); Set changeStatus = ChangePoleStatus.getChangeStatus(connectorStatusInfos); - if (!connectorStatusInfos.isEmpty()) { + if (!changeStatus.isEmpty()) { for (XhpcInternetUser xhpcInternetUser : xhpcInternetUserList) { XhpcStationInternetBlacklist xhpcStationInternetBlacklist = xhpcStationInternetBlacklistRepo.findByChargingStationIdAndInternetUserId(Long.valueOf(stationTerminalKey.split(":")[1]), @@ -96,20 +98,14 @@ public class NotificationStationStatusTask extends CoreDispatcher { } } - public EvcsStatus notify(ConnectorStatusInfo connectorStatusInfo, AuthSecretToken authSecretTokenOut) throws IOException { + public void notify(ConnectorStatusInfo connectorStatusInfo, AuthSecretToken authSecretTokenOut) throws IOException { ConnectorStatusInfoReq connectorStatusInfoReq = new ConnectorStatusInfoReq(); connectorStatusInfoReq.setConnectorStatusInfo(connectorStatusInfo); String data = JSONUtil.toJSONString(connectorStatusInfoReq); CommonRequest commonRequest = new CommonRequest<>(); commonRequest.setData(data); - String responseBody = ok(commonRequest, "/notification_stationStatus", authSecretTokenOut); - EvcsStatus status = DTOJsonHelper.parseResponseData(responseBody, EvcsStatus.class, authSecretTokenOut); - if (status == null || status.getStatus() != 0) { - log.error("op3dp[{}] push station status connector[{}] failed: {}", - authSecretTokenOut.getOperatorId3irdpty(), connectorStatusInfo.getConnectorID(), responseBody); - } - return status; + ok(commonRequest, "/notification_stationStatus", authSecretTokenOut); } }