From 3a186cb91569155e2b6cddde7c5ccc2e82a8bbbd Mon Sep 17 00:00:00 2001 From: ZZ Date: Mon, 22 Nov 2021 13:40:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=81=9C=E6=AD=A2=E5=85=85?= =?UTF-8?q?=E7=94=B5=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NotificationStopChargeResultTask.java | 50 ++++++------------- 1 file changed, 16 insertions(+), 34 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 ec4c83f6..93f62cab 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 @@ -24,7 +24,7 @@ public class NotificationStopChargeResultTask extends CoreDispatcher { @Autowired private AuthSecretTokenRepository authSecretTokenRepository; - @Scheduled(fixedRate = 1000 * 5) + @Scheduled(fixedRate = 1000 * 3) public void run() throws Exception { notifyService(); @@ -47,40 +47,28 @@ public class NotificationStopChargeResultTask extends CoreDispatcher { Collection pushOrders = REDIS.keys("pushOrder:*"); for (String pushOrderKey : pushOrders) { - Map pushOrder = REDIS.getCacheMap(pushOrderKey); - Boolean stopCommandSent = (Boolean) pushOrder.get("stopCommandSent"); - if (stopCommandSent == null) { - continue; - } String orderNo = pushOrderKey.substring(10); - Map cacheOrder = REDIS.getCacheMap("order:" + orderNo); - final Object stopResult = cacheOrder.get("stopResult"); - if (stopResult == null) { - continue; - } - String operatorId3rdpty = (String) pushOrder.get("operatorId3rdpty"); - AuthSecretToken authSecretTokenOut = - authSecretTokenRepository.findByOperatorId3irdptyAndSecretTokenType(operatorId3rdpty, - SECRET_TOKEN_TYPE_OUT).orElse(null); - CommonRequest commonRequest = new CommonRequest<>(); - ChargeResultRequest chargeResultRequest = new ChargeResultRequest(); - if (stopCommandSent) { - //获取内部的充电订单号 - //通过充电订单号，获取指定的订单 - //判断订单充电状态 - //获取指定的订单的数据 - CacheOrderData orderData = (CacheOrderData) cacheOrder.get("orderData"); - String internetSerialNumber = (String) pushOrder.get("internetSerialNumber"); - chargeResultRequest.setStartChargeSeq(internetSerialNumber); - if (orderData != null) { + String orderkey = "order:".concat(orderNo); + CacheOrderData orderData = REDIS.getCacheMapValue(orderkey, "orderData"); + if (orderData != null) { + Map pushOrder = REDIS.getCacheMap(pushOrderKey); + Boolean stopCommandSent = (Boolean) pushOrder.get("stopCommandSent"); + if (stopCommandSent != null && !stopCommandSent) { + String operatorId3rdpty = (String) pushOrder.get("operatorId3rdpty"); + AuthSecretToken authSecretTokenOut = + authSecretTokenRepository.findByOperatorId3irdptyAndSecretTokenType(operatorId3rdpty, + SECRET_TOKEN_TYPE_OUT).orElse(null); + CommonRequest commonRequest = new CommonRequest<>(); + ChargeResultRequest chargeResultRequest = new ChargeResultRequest(); + String internetSerialNumber = (String) pushOrder.get("internetSerialNumber"); + chargeResultRequest.setStartChargeSeq(internetSerialNumber); //使用指定包装类封装数据 chargeResultRequest.setConnectorID(orderData.getPileNo() + orderData.getGunId()); int succStat = 0; int failReason = 0; chargeResultRequest.setStartChargeSeqStat(4); chargeResultRequest.setSuccStat(succStat); - chargeResultRequest.setFailReason(failReason); - + chargeResultRequest.setFailReason(3); //将其转换为json String jsonData = JSONUtil.toJSONString(chargeResultRequest); commonRequest.setData(jsonData); @@ -99,11 +87,5 @@ public class NotificationStopChargeResultTask extends CoreDispatcher { } } } - - //推送充电订单信息 -// new NotificationChargeOrderInfo().pushChargeOrderInfo(); -// -// //进行账单对账 -// new CheckChargeOrders().checkChargeOrder(); } }