autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-05-12 05:50:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 宁夏平台 Service

Browse Source
This commit is contained in:
Lemon
2024-05-30 14:17:09 +08:00
parent b3f847dba3
commit ad0e0b5883
2 changed files with 53 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
jsowell-admin/src/main/java/com/jsowell/api/thirdparty/NingXiaController.java vendored
View File

@@ -163,13 +163,15 @@ public class NingXiaController extends ThirdPartyBaseController {
@PostMapping("/v1/supervise_notification_station_status") @PostMapping("/v1/supervise_notification_station_status")
public RestApiResponse<?> superviseNotificationStationStatus(@RequestBody PushRealTimeInfoDTO dto) { public RestApiResponse<?> superviseNotificationStationStatus(@RequestBody PushRealTimeInfoDTO dto) {
RestApiResponse<?> response = null; RestApiResponse<?> response = null;
String result = null;
try { try {
String result = platformLogic.notificationStationStatus(dto); result = platformLogic.notificationStationStatus(dto);
response = new RestApiResponse<>(result); response = new RestApiResponse<>(result);
} catch (Exception e) { } catch (Exception e) {
logger.error("宁夏平台推送充电设备接口状态信息 error", e); logger.error("宁夏平台推送充电设备接口状态信息 error", e);
return new RestApiResponse<>(e); return new RestApiResponse<>(e);
} }
logger.info("宁夏平台推送充电设备接口状态信息 result:{}", result);
return response; return response;
} }
@@ -181,13 +183,15 @@ public class NingXiaController extends ThirdPartyBaseController {
@GetMapping("/v1/supervise_notification_equip_charge_status/{orderCode}") @GetMapping("/v1/supervise_notification_equip_charge_status/{orderCode}")
public RestApiResponse<?> superviseNotificationEquipChargeStatus(@PathVariable("orderCode") String orderCode) { public RestApiResponse<?> superviseNotificationEquipChargeStatus(@PathVariable("orderCode") String orderCode) {
RestApiResponse<?> response = null; RestApiResponse<?> response = null;
String result = null;
try { try {
String result = platformLogic.notificationEquipChargeStatus(orderCode); result = platformLogic.notificationEquipChargeStatus(orderCode);
response = new RestApiResponse<>(result); response = new RestApiResponse<>(result);
} catch (Exception e) { } catch (Exception e) {
logger.error("宁夏平台推送充电状态信息 error", e); logger.error("宁夏平台推送充电状态信息 error", e);
return new RestApiResponse<>(e); return new RestApiResponse<>(e);
} }
logger.info("宁夏平台推送充电状态信息 result:{}", result);
return response; return response;
} }
@@ -199,13 +203,15 @@ public class NingXiaController extends ThirdPartyBaseController {
@GetMapping("/v1/supervise_notification_charge_order_info_history/{orderCode}") @GetMapping("/v1/supervise_notification_charge_order_info_history/{orderCode}")
public RestApiResponse<?> notificationChargeOrderInfoHistory(@PathVariable("orderCode") String orderCode) { public RestApiResponse<?> notificationChargeOrderInfoHistory(@PathVariable("orderCode") String orderCode) {
RestApiResponse<?> response = null; RestApiResponse<?> response = null;
String result = null;
try { try {
String result = platformLogic.notificationChargeOrderInfoHistory(orderCode); result = platformLogic.notificationChargeOrderInfoHistory(orderCode);
response = new RestApiResponse<>(result); response = new RestApiResponse<>(result);
} catch (Exception e) { } catch (Exception e) {
logger.error("宁夏平台推送充电站历史充电订单信息 error", e); logger.error("宁夏平台推送充电站历史充电订单信息 error", e);
return new RestApiResponse<>(e); return new RestApiResponse<>(e);
} }
logger.info("宁夏平台推送充电站历史充电订单信息 result:{}", result);
return response; return response;
} }
} }

96
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/NinaXiaPlatformServiceImpl.java vendored
View File

@@ -361,18 +361,14 @@ public class NinaXiaPlatformServiceImpl implements ThirdPartyPlatformService {
// 查出该桩所属哪个站点 // 查出该桩所属哪个站点
String pileSn = StringUtils.substring(pileConnectorCode, 0, 14); String pileSn = StringUtils.substring(pileConnectorCode, 0, 14);
PileStationVO stationVO = pileStationInfoService.getStationInfoByPileSn(pileSn); ThirdPartySecretInfoVO ningXiaSecretInfo = getNingXiaPlatformSecretInfo();
// 通过站点id查询相关配置信息
ThirdPartyStationRelationVO relationInfo = thirdPartyStationRelationService.selectRelationInfo(stationVO.getId()); String operatorId = ningXiaSecretInfo.getTheirOperatorId();
if (relationInfo == null) { String operatorSecret = ningXiaSecretInfo.getTheirOperatorSecret();
return null; String signSecret = ningXiaSecretInfo.getTheirSigSecret();
} String dataSecret = ningXiaSecretInfo.getTheirDataSecret();
String operatorId = relationInfo.getOperatorId(); String dataSecretIv = ningXiaSecretInfo.getTheirDataSecretIv();
String operatorSecret = relationInfo.getOperatorSecret(); String urlAddress = ningXiaSecretInfo.getTheirUrlPrefix();
String signSecret = relationInfo.getSignSecret();
String dataSecret = relationInfo.getDataSecret();
String dataSecretIv = relationInfo.getDataSecretIv();
String urlAddress = relationInfo.getUrlAddress();
String url = urlAddress + BusinessInformationExchangeEnum.NOTIFICATION_STATION_STATUS.getValue(); String url = urlAddress + BusinessInformationExchangeEnum.NOTIFICATION_STATION_STATUS.getValue();
ConnectorStatusInfo info = ConnectorStatusInfo.builder() ConnectorStatusInfo info = ConnectorStatusInfo.builder()
@@ -451,18 +447,14 @@ public class NinaXiaPlatformServiceImpl implements ThirdPartyPlatformService {
return null; return null;
} }
// 通过站点id查询相关配置信息 ThirdPartySecretInfoVO ningXiaSecretInfo = getNingXiaPlatformSecretInfo();
ThirdPartyStationRelationVO relationInfo = thirdPartyStationRelationService.selectRelationInfo(orderBasicInfo.getStationId());
if (relationInfo == null) {
return null;
}
String operatorId = relationInfo.getOperatorId(); String operatorId = ningXiaSecretInfo.getTheirOperatorId();
String operatorSecret = relationInfo.getOperatorSecret(); String operatorSecret = ningXiaSecretInfo.getTheirOperatorSecret();
String signSecret = relationInfo.getSignSecret(); String signSecret = ningXiaSecretInfo.getTheirSigSecret();
String dataSecret = relationInfo.getDataSecret(); String dataSecret = ningXiaSecretInfo.getTheirDataSecret();
String dataSecretIv = relationInfo.getDataSecretIv(); String dataSecretIv = ningXiaSecretInfo.getTheirDataSecretIv();
String urlAddress = relationInfo.getUrlAddress(); String urlAddress = ningXiaSecretInfo.getTheirUrlPrefix();
// 根据订单号查询订单详情 // 根据订单号查询订单详情
OrderDetail orderDetail = orderBasicInfoService.getOrderDetailByOrderCode(orderCode); OrderDetail orderDetail = orderBasicInfoService.getOrderDetailByOrderCode(orderCode);
@@ -576,27 +568,20 @@ public class NinaXiaPlatformServiceImpl implements ThirdPartyPlatformService {
public String notificationEquipChargeStatus(String orderCode) { public String notificationEquipChargeStatus(String orderCode) {
// 根据订单号查询订单信息 // 根据订单号查询订单信息
OrderBasicInfo orderInfo = orderBasicInfoService.getOrderInfoByOrderCode(orderCode); OrderBasicInfo orderInfo = orderBasicInfoService.getOrderInfoByOrderCode(orderCode);
// 通过第三方平台类型查询相关配置信息 ThirdPartySecretInfoVO ningXiaSecretInfo = getNingXiaPlatformSecretInfo();
ThirdPartyStationRelation relation = new ThirdPartyStationRelation();
relation.setThirdPartyType(orderInfo.getThirdPartyType()); String operatorId = ningXiaSecretInfo.getTheirOperatorId();
ThirdPartyStationRelationVO relationInfo = thirdPartyStationRelationService.selectRelationInfo(relation); String operatorSecret = ningXiaSecretInfo.getTheirOperatorSecret();
// ThirdPartySettingInfo settingInfo = thirdPartySettingInfoService.getInfoByStationId(Long.parseLong(orderInfo.getStationId())); String signSecret = ningXiaSecretInfo.getTheirSigSecret();
if (relationInfo == null) { String dataSecret = ningXiaSecretInfo.getTheirDataSecret();
return null; String dataSecretIv = ningXiaSecretInfo.getTheirDataSecretIv();
} String urlAddress = ningXiaSecretInfo.getTheirUrlPrefix();
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();
// 调用 查询充电状态方法 // 调用 查询充电状态方法
QueryEquipChargeStatusDTO dto = new QueryEquipChargeStatusDTO(); QueryEquipChargeStatusDTO dto = new QueryEquipChargeStatusDTO();
dto.setStartChargeSeq(orderCode); dto.setStartChargeSeq(orderCode);
// 根据type获取operatorId // 根据type获取operatorId
String operatorIdByType = ThirdPartyOperatorIdEnum.getOperatorIdByType(thirdPartyType); String operatorIdByType = ThirdPlatformTypeEnum.NING_XIA_PLATFORM.getOperatorId();
dto.setOperatorID(operatorIdByType); dto.setOperatorID(operatorIdByType);
Map<String, String> map = queryEquipChargeStatus(dto); Map<String, String> map = queryEquipChargeStatus(dto);
if (map == null) { if (map == null) {
@@ -644,20 +629,17 @@ public class NinaXiaPlatformServiceImpl implements ThirdPartyPlatformService {
// 根据订单号查询出信息 // 根据订单号查询出信息
OrderBasicInfo orderBasicInfo = orderBasicInfoService.getOrderInfoByOrderCode(orderCode); OrderBasicInfo orderBasicInfo = orderBasicInfoService.getOrderInfoByOrderCode(orderCode);
// 通过站点id查询相关配置信息 ThirdPartySecretInfoVO ningXiaSecretInfo = getNingXiaPlatformSecretInfo();
ThirdPartyStationRelationVO relationInfo = thirdPartyStationRelationService.selectRelationInfo(orderBasicInfo.getStationId());
if (relationInfo == null) { String operatorId = ningXiaSecretInfo.getTheirOperatorId();
return null; 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); 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"; String url = urlAddress + "supervise_notification_charge_order_info_history";
// 拼装成内蒙古平台所需格式对象 // 拼装成内蒙古平台所需格式对象
@@ -899,4 +881,14 @@ public class NinaXiaPlatformServiceImpl implements ThirdPartyPlatformService {
return result; 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;
}
} }