From 67f973ac9b1bdc6fcf4c13a60c76a50949e8ffa1 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Wed, 24 Jul 2024 13:55:55 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=85=85=E7=94=B5=E4=B8=AD,?= =?UTF-8?q?=20=E5=BC=82=E6=AD=A5=E5=8F=91=E9=80=81=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=AE=9E=E6=97=B6=E6=95=B0=E6=8D=AE=E6=8C=87=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsowell/service/OrderService.java | 20 ++++++++++++++++--- .../pile/service/PileRemoteService.java | 1 - 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java index 765b38bb6..c56812191 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -557,10 +557,24 @@ public class OrderService { throw new BusinessException(ReturnCodeEnum.CODE_QUERY_ORDER_INFO_IS_NULL); } + String pileSn = orderBasicInfo.getPileSn(); + String connectorCode = orderBasicInfo.getConnectorCode(); + + // 异步发送获取实时数据指令 + if (StringUtils.equals(orderBasicInfo.getOrderStatus(), OrderStatusEnum.IN_THE_CHARGING.getValue())) { + CompletableFuture.runAsync(() -> { + try { + pileRemoteService.getRealTimeMonitorData(pileSn, connectorCode); + } catch (Exception e) { + log.error("异步发送获取实时数据指令error", e); + } + }); + } + vo.setOrderCode(orderBasicInfo.getOrderCode()); - vo.setPileSn(orderBasicInfo.getPileSn()); - vo.setConnectorCode(orderBasicInfo.getConnectorCode()); - vo.setPileConnectorCode(orderBasicInfo.getPileSn() + orderBasicInfo.getConnectorCode()); + vo.setPileSn(pileSn); + vo.setConnectorCode(connectorCode); + vo.setPileConnectorCode(pileSn + connectorCode); String orderStatus = orderBasicInfo.getOrderStatus(); vo.setOrderStatus(orderStatus); if (Objects.nonNull(orderBasicInfo.getChargeStartTime())) { diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileRemoteService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileRemoteService.java index 193cad20b..f0393abdf 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileRemoteService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileRemoteService.java @@ -72,7 +72,6 @@ public class PileRemoteService { .build(); ykcPushCommandService.pushGetRealTimeMonitorDataCommand(command); } - } /**