From ad0e0b58838cabd7f4ef961bafebcdb7562d3a3e Mon Sep 17 00:00:00 2001 From: Lemon Date: Thu, 30 May 2024 14:17:09 +0800 Subject: [PATCH] =?UTF-8?q?update=20=20=E5=AE=81=E5=A4=8F=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=20Service?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/thirdparty/NingXiaController.java | 12 ++- .../impl/NinaXiaPlatformServiceImpl.java | 96 +++++++++---------- 2 files changed, 53 insertions(+), 55 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/NingXiaController.java b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/NingXiaController.java index e21430ab3..da0167301 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/NingXiaController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/NingXiaController.java @@ -163,13 +163,15 @@ public class NingXiaController extends ThirdPartyBaseController { @PostMapping("/v1/supervise_notification_station_status") public RestApiResponse superviseNotificationStationStatus(@RequestBody PushRealTimeInfoDTO dto) { RestApiResponse response = null; + String result = null; try { - String result = platformLogic.notificationStationStatus(dto); + result = platformLogic.notificationStationStatus(dto); response = new RestApiResponse<>(result); } catch (Exception e) { logger.error("宁夏平台推送充电设备接口状态信息 error", e); return new RestApiResponse<>(e); } + logger.info("宁夏平台推送充电设备接口状态信息 result:{}", result); return response; } @@ -181,13 +183,15 @@ public class NingXiaController extends ThirdPartyBaseController { @GetMapping("/v1/supervise_notification_equip_charge_status/{orderCode}") public RestApiResponse superviseNotificationEquipChargeStatus(@PathVariable("orderCode") String orderCode) { RestApiResponse response = null; + String result = null; try { - String result = platformLogic.notificationEquipChargeStatus(orderCode); + result = platformLogic.notificationEquipChargeStatus(orderCode); response = new RestApiResponse<>(result); } catch (Exception e) { logger.error("宁夏平台推送充电状态信息 error", e); return new RestApiResponse<>(e); } + logger.info("宁夏平台推送充电状态信息 result:{}", result); return response; } @@ -199,13 +203,15 @@ public class NingXiaController extends ThirdPartyBaseController { @GetMapping("/v1/supervise_notification_charge_order_info_history/{orderCode}") public RestApiResponse notificationChargeOrderInfoHistory(@PathVariable("orderCode") String orderCode) { RestApiResponse response = null; + String result = null; try { - String result = platformLogic.notificationChargeOrderInfoHistory(orderCode); + result = platformLogic.notificationChargeOrderInfoHistory(orderCode); response = new RestApiResponse<>(result); } catch (Exception e) { logger.error("宁夏平台推送充电站历史充电订单信息 error", e); return new RestApiResponse<>(e); } + logger.info("宁夏平台推送充电站历史充电订单信息 result:{}", result); return response; } } diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/NinaXiaPlatformServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/NinaXiaPlatformServiceImpl.java index dd89f84dc..c7007dea8 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/NinaXiaPlatformServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/NinaXiaPlatformServiceImpl.java @@ -361,18 +361,14 @@ public class NinaXiaPlatformServiceImpl implements ThirdPartyPlatformService { // 查出该桩所属哪个站点 String pileSn = StringUtils.substring(pileConnectorCode, 0, 14); - PileStationVO stationVO = pileStationInfoService.getStationInfoByPileSn(pileSn); - // 通过站点id查询相关配置信息 - ThirdPartyStationRelationVO relationInfo = thirdPartyStationRelationService.selectRelationInfo(stationVO.getId()); - if (relationInfo == null) { - return null; - } - String operatorId = relationInfo.getOperatorId(); - String operatorSecret = relationInfo.getOperatorSecret(); - String signSecret = relationInfo.getSignSecret(); - String dataSecret = relationInfo.getDataSecret(); - String dataSecretIv = relationInfo.getDataSecretIv(); - String urlAddress = relationInfo.getUrlAddress(); + ThirdPartySecretInfoVO ningXiaSecretInfo = getNingXiaPlatformSecretInfo(); + + String operatorId = ningXiaSecretInfo.getTheirOperatorId(); + String operatorSecret = ningXiaSecretInfo.getTheirOperatorSecret(); + String signSecret = ningXiaSecretInfo.getTheirSigSecret(); + String dataSecret = ningXiaSecretInfo.getTheirDataSecret(); + String dataSecretIv = ningXiaSecretInfo.getTheirDataSecretIv(); + String urlAddress = ningXiaSecretInfo.getTheirUrlPrefix(); String url = urlAddress + BusinessInformationExchangeEnum.NOTIFICATION_STATION_STATUS.getValue(); ConnectorStatusInfo info = ConnectorStatusInfo.builder() @@ -451,18 +447,14 @@ public class NinaXiaPlatformServiceImpl implements ThirdPartyPlatformService { return null; } - // 通过站点id查询相关配置信息 - ThirdPartyStationRelationVO relationInfo = thirdPartyStationRelationService.selectRelationInfo(orderBasicInfo.getStationId()); - if (relationInfo == null) { - return null; - } + ThirdPartySecretInfoVO ningXiaSecretInfo = getNingXiaPlatformSecretInfo(); - String operatorId = relationInfo.getOperatorId(); - String operatorSecret = relationInfo.getOperatorSecret(); - String signSecret = relationInfo.getSignSecret(); - String dataSecret = relationInfo.getDataSecret(); - String dataSecretIv = relationInfo.getDataSecretIv(); - String urlAddress = relationInfo.getUrlAddress(); + String operatorId = ningXiaSecretInfo.getTheirOperatorId(); + String operatorSecret = ningXiaSecretInfo.getTheirOperatorSecret(); + String signSecret = ningXiaSecretInfo.getTheirSigSecret(); + String dataSecret = ningXiaSecretInfo.getTheirDataSecret(); + String dataSecretIv = ningXiaSecretInfo.getTheirDataSecretIv(); + String urlAddress = ningXiaSecretInfo.getTheirUrlPrefix(); // 根据订单号查询订单详情 OrderDetail orderDetail = orderBasicInfoService.getOrderDetailByOrderCode(orderCode); @@ -576,27 +568,20 @@ public class NinaXiaPlatformServiceImpl implements ThirdPartyPlatformService { public String notificationEquipChargeStatus(String orderCode) { // 根据订单号查询订单信息 OrderBasicInfo orderInfo = orderBasicInfoService.getOrderInfoByOrderCode(orderCode); - // 通过第三方平台类型查询相关配置信息 - ThirdPartyStationRelation relation = new ThirdPartyStationRelation(); - relation.setThirdPartyType(orderInfo.getThirdPartyType()); - ThirdPartyStationRelationVO relationInfo = thirdPartyStationRelationService.selectRelationInfo(relation); - // ThirdPartySettingInfo settingInfo = thirdPartySettingInfoService.getInfoByStationId(Long.parseLong(orderInfo.getStationId())); - if (relationInfo == null) { - return null; - } - String operatorId = relationInfo.getOperatorId(); - String operatorSecret = relationInfo.getOperatorSecret(); - String signSecret = relationInfo.getSignSecret(); - String dataSecret = relationInfo.getDataSecret(); - String dataSecretIv = relationInfo.getDataSecretIv(); - String urlAddress = relationInfo.getUrlAddress(); - String thirdPartyType = relationInfo.getThirdPartyType(); + ThirdPartySecretInfoVO ningXiaSecretInfo = getNingXiaPlatformSecretInfo(); + + String operatorId = ningXiaSecretInfo.getTheirOperatorId(); + String operatorSecret = ningXiaSecretInfo.getTheirOperatorSecret(); + String signSecret = ningXiaSecretInfo.getTheirSigSecret(); + String dataSecret = ningXiaSecretInfo.getTheirDataSecret(); + String dataSecretIv = ningXiaSecretInfo.getTheirDataSecretIv(); + String urlAddress = ningXiaSecretInfo.getTheirUrlPrefix(); // 调用 查询充电状态方法 QueryEquipChargeStatusDTO dto = new QueryEquipChargeStatusDTO(); dto.setStartChargeSeq(orderCode); // 根据type获取operatorId - String operatorIdByType = ThirdPartyOperatorIdEnum.getOperatorIdByType(thirdPartyType); + String operatorIdByType = ThirdPlatformTypeEnum.NING_XIA_PLATFORM.getOperatorId(); dto.setOperatorID(operatorIdByType); Map map = queryEquipChargeStatus(dto); if (map == null) { @@ -644,20 +629,17 @@ public class NinaXiaPlatformServiceImpl implements ThirdPartyPlatformService { // 根据订单号查询出信息 OrderBasicInfo orderBasicInfo = orderBasicInfoService.getOrderInfoByOrderCode(orderCode); - // 通过站点id查询相关配置信息 - ThirdPartyStationRelationVO relationInfo = thirdPartyStationRelationService.selectRelationInfo(orderBasicInfo.getStationId()); - if (relationInfo == null) { - return null; - } + ThirdPartySecretInfoVO ningXiaSecretInfo = getNingXiaPlatformSecretInfo(); + + String operatorId = ningXiaSecretInfo.getTheirOperatorId(); + String operatorSecret = ningXiaSecretInfo.getTheirOperatorSecret(); + String signSecret = ningXiaSecretInfo.getTheirSigSecret(); + String dataSecret = ningXiaSecretInfo.getTheirDataSecret(); + String dataSecretIv = ningXiaSecretInfo.getTheirDataSecretIv(); + String urlAddress = ningXiaSecretInfo.getTheirUrlPrefix(); + + OrderDetail orderDetail = orderBasicInfoService.getOrderDetailByOrderCode(orderCode); - - String operatorId = relationInfo.getOperatorId(); - String operatorSecret = relationInfo.getOperatorSecret(); - String signSecret = relationInfo.getSignSecret(); - String dataSecret = relationInfo.getDataSecret(); - String dataSecretIv = relationInfo.getDataSecretIv(); - String urlAddress = relationInfo.getUrlAddress(); - String url = urlAddress + "supervise_notification_charge_order_info_history"; // 拼装成内蒙古平台所需格式对象 @@ -899,4 +881,14 @@ public class NinaXiaPlatformServiceImpl implements ThirdPartyPlatformService { return result; } + + // 获取青海平台配置密钥信息 + private ThirdPartySecretInfoVO getNingXiaPlatformSecretInfo() { + // 通过第三方平台类型查询相关配置信息 + ThirdPartySecretInfoVO thirdPartySecretInfoVO = thirdpartySecretInfoService.queryByThirdPlatformType(ThirdPlatformTypeEnum.NING_XIA_PLATFORM.getTypeCode()); + if (thirdPartySecretInfoVO == null) { + throw new BusinessException(ReturnCodeEnum.CODE_SELECT_INFO_IS_NULL); + } + return thirdPartySecretInfoVO; + } }