From 34834dda91e06cb2fd9fcda93f7e7687bf7f14dd Mon Sep 17 00:00:00 2001 From: "DESKTOP-D9QDT1P\\JS-ZZA" Date: Thu, 9 Mar 2023 16:52:57 +0800 Subject: [PATCH] =?UTF-8?q?update=20=20=E6=A1=A9=E9=80=80=E5=87=BA?= =?UTF-8?q?=E6=97=B6=E5=B0=86=E6=AD=A3=E5=9C=A8=E5=85=85=E7=94=B5=E7=9A=84?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=94=B9=E4=B8=BA=20=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/YKCBusinessServiceImpl.java | 29 ++++++++++--------- .../pile/service/IOrderBasicInfoService.java | 7 +++++ .../impl/OrderBasicInfoServiceImpl.java | 25 ++++++++++++++++ .../impl/PileConnectorInfoServiceImpl.java | 2 ++ 4 files changed, 49 insertions(+), 14 deletions(-) diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/service/yunkuaichong/impl/YKCBusinessServiceImpl.java b/jsowell-netty/src/main/java/com/jsowell/netty/service/yunkuaichong/impl/YKCBusinessServiceImpl.java index 26e41e063..c14741ea4 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/service/yunkuaichong/impl/YKCBusinessServiceImpl.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/service/yunkuaichong/impl/YKCBusinessServiceImpl.java @@ -68,20 +68,21 @@ public class YKCBusinessServiceImpl implements YKCBusinessService { pileConnectorInfoService.updateConnectorStatusByPileSn(pileSn, PileConnectorDataBaseStatusEnum.OFF_NETWORK.getValue()); // 将此桩正在进行充电的订单状态改为 异常 - List orderListVOS = orderBasicInfoService.selectChargingOrder(pileSn); - if (CollectionUtils.isNotEmpty(orderListVOS)) { - for (OrderListVO orderListVO : orderListVOS) { - if (StringUtils.equals(orderListVO.getOrderStatus(), OrderStatusEnum.IN_THE_CHARGING.getValue())) { - // 修改数据库订单状态 - OrderBasicInfo info = OrderBasicInfo.builder() - .id(Long.parseLong(orderListVO.getId())) - .orderStatus(OrderStatusEnum.ABNORMAL.getValue()) - .build(); - orderBasicInfoService.updateOrderBasicInfo(info); - log.info("充电桩:{}退出, 修改充电桩正在充电的订单状态为异常, orderCode: {}", pileSn, orderListVO.getOrderCode()); - } - } - } + orderBasicInfoService.updateOrderStatusAsAbnormal(pileSn); + // List orderListVOS = orderBasicInfoService.selectChargingOrder(pileSn); + // if (CollectionUtils.isNotEmpty(orderListVOS)) { + // for (OrderListVO orderListVO : orderListVOS) { + // if (StringUtils.equals(orderListVO.getOrderStatus(), OrderStatusEnum.IN_THE_CHARGING.getValue())) { + // // 修改数据库订单状态 + // OrderBasicInfo info = OrderBasicInfo.builder() + // .id(Long.parseLong(orderListVO.getId())) + // .orderStatus(OrderStatusEnum.ABNORMAL.getValue()) + // .build(); + // orderBasicInfoService.updateOrderBasicInfo(info); + // log.info("充电桩:{}退出, 修改充电桩正在充电的订单状态为异常, orderCode: {}", pileSn, orderListVO.getOrderCode()); + // } + // } + // } // 记录充电桩退出msg // 保存报文 diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java index 2dcb9f955..a3b875daf 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java @@ -191,4 +191,11 @@ public interface IOrderBasicInfoService { * @return */ List getAccumulativeInfo(QueryPersonPileDTO dto); + + /** + * 修改订单状态为异常（桩离线时调用） + * + * @param pileSn + */ + void updateOrderStatusAsAbnormal(String pileSn); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index 16ae23b56..8267fc2d2 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -952,4 +952,29 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { public List getAccumulativeInfo(QueryPersonPileDTO dto) { return orderBasicInfoMapper.getAccumulativeInfo(dto); } + + /** + * 修改订单状态为异常（桩离线时调用） + * + * @param pileSn + */ + @Override + public void updateOrderStatusAsAbnormal(String pileSn) { + // 将此桩正在进行充电的订单状态改为 异常 + List orderListVOS = selectChargingOrder(pileSn); + if (CollectionUtils.isEmpty(orderListVOS)) { + return; + } + for (OrderListVO orderListVO : orderListVOS) { + if (StringUtils.equals(orderListVO.getOrderStatus(), OrderStatusEnum.IN_THE_CHARGING.getValue())) { + // 修改数据库订单状态 + OrderBasicInfo info = OrderBasicInfo.builder() + .id(Long.parseLong(orderListVO.getId())) + .orderStatus(OrderStatusEnum.ABNORMAL.getValue()) + .build(); + updateOrderBasicInfo(info); + logger.info("充电桩:{}退出, 修改充电桩正在充电的订单状态为异常, orderCode: {}", pileSn, orderListVO.getOrderCode()); + } + } + } } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java index 4e84292d7..86434eae2 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java @@ -526,6 +526,8 @@ public class PileConnectorInfoServiceImpl implements IPileConnectorInfoService { if (connectorStatusList.contains(PileConnectorDataBaseStatusEnum.OFF_NETWORK.getValue())) { pileStatus = PileStatusEnum.OFF_LINE.getValue(); flag = true; + // 将此桩正在进行充电的订单状态改为 异常 + orderBasicInfoService.updateOrderStatusAsAbnormal(pileSn); } // 没有故障或者离线，就是在线状态