From dde52e3431195f773c8e9f271bce7fae89da0661 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Fri, 24 May 2024 10:25:36 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E5=85=85=E7=94=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsowell/api/uniapp/PileController.java | 4 +++ .../ykcCommond/ReservedChargingCommand.java | 1 + .../impl/OrderBasicInfoServiceImpl.java | 27 +++++++++++++++++++ .../impl/YKCPushCommandServiceImpl.java | 2 +- .../amap/service/impl/AMapServiceImpl.java | 5 ---- 5 files changed, 33 insertions(+), 6 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PileController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PileController.java index 870e6face..035eb2a02 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PileController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PileController.java @@ -222,4 +222,8 @@ public class PileController extends BaseController { commonService.commonQueryStationStatus(stationId, thirdPartyType); } } + + /** + * 预约充电接口 + */ } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/ykcCommond/ReservedChargingCommand.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ykcCommond/ReservedChargingCommand.java index fac1d5b8f..afe6af235 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/ykcCommond/ReservedChargingCommand.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ykcCommond/ReservedChargingCommand.java @@ -33,6 +33,7 @@ public class ReservedChargingCommand { /** * 操作 + * 0x01:启动 0x02:取消 0x03:修改 */ private String operation; 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 e93b35ff5..97aea33d2 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 @@ -29,6 +29,7 @@ import com.jsowell.common.enums.thirdparty.ThirdPartyOperatorIdEnum; import com.jsowell.common.enums.thirdparty.ThirdPlatformTypeEnum; import com.jsowell.common.enums.ykc.*; import com.jsowell.common.exception.BusinessException; +import com.jsowell.common.util.BytesUtil; import com.jsowell.common.util.DateUtils; import com.jsowell.common.util.PageUtils; import com.jsowell.common.util.StringUtils; @@ -36,6 +37,7 @@ import com.jsowell.common.util.bean.BeanUtils; import com.jsowell.common.util.id.IdUtils; import com.jsowell.common.util.id.SnowflakeIdWorker; import com.jsowell.pile.domain.*; +import com.jsowell.pile.domain.ykcCommond.ReservedChargingCommand; import com.jsowell.pile.dto.*; import com.jsowell.pile.dto.nanrui.NRQueryOrderDTO; import com.jsowell.pile.dto.ningxiajiaotou.NXJTQueryOrdersInfoDTO; @@ -3548,6 +3550,9 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { } } + /** + * 预约时间 + */ if (StringUtils.equals(dto.getStartType(), StartTypeEnum.RESERVED.getValue())) { orderBasicInfo.setReservedStartTime(DateUtils.parseDate(dto.getReservedStartTime(), DateUtils.YYYY_MM_DD_HH_MM_SS)); orderBasicInfo.setReservedEndTime(DateUtils.parseDate(dto.getReservedEndTime(), DateUtils.YYYY_MM_DD_HH_MM_SS)); @@ -3586,6 +3591,28 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { .orderDetail(orderDetail) .build(); pileTransactionService.doCreateOrder(createOrderTransactionDTO); + + /** + * 异步发送预约充电指令 + */ + if (StringUtils.equals(dto.getStartType(), StartTypeEnum.RESERVED.getValue())) { + ReservedChargingCommand command = ReservedChargingCommand.builder() + .transactionCode(orderBasicInfo.getTransactionCode()) + .pileSn(orderBasicInfo.getPileSn()) + .connectorCode(orderBasicInfo.getPileConnectorCode()) + .operation(BytesUtil.bcd2Str(new byte[]{0x01})) + .reservedStartTime(DateUtils.parseDate(dto.getReservedStartTime(), DateUtils.YYYY_MM_DD_HH_MM_SS)) + .reservedStartTime(DateUtils.parseDate(dto.getReservedEndTime(), DateUtils.YYYY_MM_DD_HH_MM_SS)) + .amount(new BigDecimal(Constants.FIVE_HUNDRED)) + .build(); + CompletableFuture.runAsync(() -> { + try { + pileRemoteService.reservedCharging(command); + } catch (Exception e) { + logger.error("人工结算订单 推送第三方平台订单信息error, orderCode:{}", orderBasicInfo.getOrderCode(), e); + } + }); + } return orderBasicInfo; } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/YKCPushCommandServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/YKCPushCommandServiceImpl.java index b0a84ccb6..54a5fd241 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/YKCPushCommandServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/YKCPushCommandServiceImpl.java @@ -486,7 +486,7 @@ public class YKCPushCommandServiceImpl implements YKCPushCommandService { String connectorCode = command.getConnectorCode(); byte[] connectorCodeByteArr = BytesUtil.str2Bcd(connectorCode); - // 枪口号 + // 0x01:启动 0x02:取消 0x03:修改 String operation = command.getOperation(); byte[] operateByteArr = BytesUtil.str2Bcd(operation); diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/service/impl/AMapServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/service/impl/AMapServiceImpl.java index 072e29009..f1a302677 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/service/impl/AMapServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/service/impl/AMapServiceImpl.java @@ -69,11 +69,6 @@ public class AMapServiceImpl implements AMapService { @Autowired private OrderBasicInfoService orderBasicInfoService; - /** - * 异步操作任务调度线程池 - */ - private ScheduledExecutorService executor = SpringUtils.getBean("scheduledExecutorService"); - /** * 高德拉取充电站静态数据 * @param dto From 13bc34d80f880d786b283e92c913ef92ec8b201d Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Fri, 24 May 2024 10:26:26 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E5=85=85=E7=94=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 97aea33d2..58b476c86 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 @@ -3609,7 +3609,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { try { pileRemoteService.reservedCharging(command); } catch (Exception e) { - logger.error("人工结算订单 推送第三方平台订单信息error, orderCode:{}", orderBasicInfo.getOrderCode(), e); + logger.error("异步发送预约充电指令, orderCode:{}", orderBasicInfo.getOrderCode(), e); } }); }