From 7cbabc5e104c2dc710bfa8285cca6d750b6bb820 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Mon, 16 Oct 2023 13:58:38 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=90=8E=E7=AE=A1=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/jsowell/service/OrderService.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 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 ca1315b6d..80cd86944 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -445,14 +445,11 @@ public class OrderService { try { if (StringUtils.equals(orderBasicInfo.getOrderStatus(), OrderStatusEnum.IN_THE_CHARGING.getValue())) { RealTimeMonitorData lastMonitorData = vo.getLastMonitorData(); - if (lastMonitorData != null) { - String dateTime = lastMonitorData.getDateTime(); - if (DateUtils.intervalTime(dateTime, DateUtils.getDateTime()) > 2L) { - // 间隔时间超过2分钟, 订单状态修改为异常 - orderBasicInfo.setOrderStatus(OrderStatusEnum.ABNORMAL.getValue()); - orderBasicInfo.setReason("充电桩长时间没有上传实时数据"); - orderBasicInfoService.updateOrderBasicInfo(orderBasicInfo); - } + if (lastMonitorData == null || DateUtils.intervalTime(lastMonitorData.getDateTime(), DateUtils.getDateTime()) > 2L) { + // 没有实时数据 或者 间隔时间超过2分钟, 订单状态修改为异常 + orderBasicInfo.setOrderStatus(OrderStatusEnum.ABNORMAL.getValue()); + orderBasicInfo.setReason("充电桩长时间没有上传实时数据"); + orderBasicInfoService.updateOrderBasicInfo(orderBasicInfo); } } } catch (Exception e) {