From 2c77853f45a175e9dbf56f8a18a79fedd52a8724 Mon Sep 17 00:00:00 2001 From: Lemon Date: Mon, 19 Feb 2024 09:00:57 +0800 Subject: [PATCH] =?UTF-8?q?update=20=20vin=E4=B8=8D=E5=86=8D=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E9=94=81=E5=AE=9A=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../thirdparty/huawei/HuaWeiControllerV2.java | 43 ++++++++++++++++--- .../ConfirmStartChargingRequestHandler.java | 8 ++-- .../impl/OrderBasicInfoServiceImpl.java | 3 +- 3 files changed, 42 insertions(+), 12 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/huawei/HuaWeiControllerV2.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/huawei/HuaWeiControllerV2.java index ede268237..59c4c2bd0 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/huawei/HuaWeiControllerV2.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/huawei/HuaWeiControllerV2.java @@ -3,6 +3,7 @@ package com.jsowell.web.controller.thirdparty.huawei; import com.alibaba.fastjson2.JSONObject; import com.jsowell.common.annotation.Anonymous; import com.jsowell.common.core.controller.BaseController; +import com.jsowell.common.exception.BusinessException; import com.jsowell.common.util.JWTUtils; import com.jsowell.pile.dto.QueryStationInfoDTO; import com.jsowell.thirdparty.huawei.HuaweiServiceV2; @@ -61,17 +62,47 @@ public class HuaWeiControllerV2 extends BaseController { @PostMapping("/v2/notification_stationStatus") public CommonResult receiveNotificationStationStatus(HttpServletRequest request, @RequestBody CommonParamsDTO dto) { logger.info("华为设备接口状态变化推送 params:{}", JSONObject.toJSONString(dto)); + String dataStr = checkAuth(request, dto); + // 转换成相应对象 + ConnectorStatusInfo connectorStatusInfo = JSONObject.parseObject(dataStr, ConnectorStatusInfo.class); + connectorStatusInfo.setOperatorId(dto.getOperatorID()); + Map map = huaweiServiceV2.receiveNotificationStationStatus(connectorStatusInfo); + return CommonResult.success(0, "设备接口状态变化推送成功！", map.get("Data"), map.get("Sig")); + } + + + @PostMapping("/v2/request_equip_business_policy") + public CommonResult requestEquipBusinessPolicy(HttpServletRequest request, @RequestBody CommonParamsDTO dto) { + return null; + } + + + + + + + + + + + + + + + private String checkAuth(HttpServletRequest request, CommonParamsDTO dto) { // 校验令牌 String token = request.getHeader("Authorization"); if (!JWTUtils.checkThirdPartyToken(token)) { // 校验失败 - return CommonResult.failed("令牌校验错误"); + logger.error("令牌校验错误"); + return null; } // 校验签名 Map resultMap = huaweiServiceV2.checkoutSign(dto); if (resultMap == null) { // 签名错误 - return CommonResult.failed("签名校验错误"); + logger.error("令牌校验错误"); + return null; } String operatorSecret = resultMap.get("OperatorSecret"); String dataString = resultMap.get("Data"); @@ -80,10 +111,8 @@ public class HuaWeiControllerV2 extends BaseController { // 解密data byte[] plainText = Cryptos.aesDecrypt(Encodes.decodeBase64(dataString), dataSecret.getBytes(), dataSecretIV.getBytes()); String dataStr = new String(plainText, StandardCharsets.UTF_8); - // 转换成相应对象 - ConnectorStatusInfo connectorStatusInfo = JSONObject.parseObject(dataStr, ConnectorStatusInfo.class); - connectorStatusInfo.setOperatorId(dto.getOperatorID()); - Map map = huaweiServiceV2.receiveNotificationStationStatus(connectorStatusInfo); - return CommonResult.success(0, "设备接口状态变化推送成功！", map.get("Data"), map.get("Sig")); + return dataStr; } + + } diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java index 82746a594..b60a7e4d7 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java @@ -190,10 +190,10 @@ public class ConfirmStartChargingRequestHandler extends AbstractHandler{ if (plateInfo == null) { throw new BusinessException("", vinCode + "未查到绑定用户信息"); } - if (!StringUtils.equals("1", plateInfo.getVinStatus())) { - // 1- 正常使用 - throw new BusinessException("", vinCode + "vin状态不正确"); - } + // if (!StringUtils.equals("1", plateInfo.getVinStatus())) { + // // 1- 正常使用 + // throw new BusinessException("", vinCode + "vin状态不正确"); + // } // vin码生成订单 vin启动充电 GenerateOrderDTO dto = new GenerateOrderDTO(); dto.setMemberPlateNumberRelation(plateInfo); 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 ec9ec220e..052f93b4e 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 @@ -2468,7 +2468,8 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { if (!StringUtils.equals(OrderPayModeEnum.PAYMENT_OF_WHITELIST.getValue(), dto.getPayMode())) { dto.getMemberPlateNumberRelation().setVinStatus("2"); } - memberPlateNumberRelationService.updateMemberPlateNumberRelation(dto.getMemberPlateNumberRelation()); + // 2024.02.06 不再判断锁定状态 + // memberPlateNumberRelationService.updateMemberPlateNumberRelation(dto.getMemberPlateNumberRelation()); } // 组装结果集