diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/JiangSuPlatformServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/JiangSuPlatformServiceImpl.java index 03c29ad00..771b35312 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/JiangSuPlatformServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/JiangSuPlatformServiceImpl.java @@ -183,21 +183,13 @@ public class JiangSuPlatformServiceImpl implements ThirdPartyPlatformService { data.put("StationInfo", nrStationInfo); String jsonString = data.toString(); - System.out.println("jsonString : " + jsonString); + // System.out.println("jsonString : " + jsonString); // 获取令牌 String token = getToken(urlAddress, operatorId, operatorSecret, dataSecretIv, signSecret, dataSecret); - System.out.println(token); String result = HttpRequestUtil.nrSendPost(token, jsonString, url, dataSecret , dataSecretIv, operatorId, signSecret); - - // 新增数据库 - PushStationInfoDTO dto = new PushStationInfoDTO(); - dto.setThirdPartyType(thirdPlatformType); - dto.setStationId(Long.parseLong(stationId)); - - commonService.insertInfo2DataBase(dto); - return thirdPlatformType + ":" + result; + return result; } diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/LianLianPlatformServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/LianLianPlatformServiceImpl.java index e85d91f3a..58227478f 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/LianLianPlatformServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/LianLianPlatformServiceImpl.java @@ -541,8 +541,9 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService { , dataSecretIv, operatorId, signSecret); // 新增数据库 - thirdPartyStationRelationService.insertInfo2DataBase(thirdPlatformType, stationId); - return thirdPlatformType + ":" + result; + // thirdPartyStationRelationService.insertInfo2DataBase(thirdPlatformType, stationId); + // return thirdPlatformType + ":" + result; + return result; } /** @@ -618,17 +619,14 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService { .totalMoney(new BigDecimal(realTimeMonitorData.getChargingAmount()).setScale(2, BigDecimal.ROUND_HALF_UP)) .build(); - // 通过站点id查询相关配置信息 - ThirdPartyStationRelationVO relationInfo = thirdPartyStationRelationService.selectRelationInfo(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(); + ThirdPartySecretInfoVO thirdPartySecretInfoVO = getLianLianPlatformSecretInfo(); + + String operatorId = thirdPartySecretInfoVO.getTheirOperatorId(); + String operatorSecret = thirdPartySecretInfoVO.getTheirOperatorSecret(); + String signSecret = thirdPartySecretInfoVO.getTheirSigSecret(); + String dataSecret = thirdPartySecretInfoVO.getTheirDataSecret(); + String dataSecretIv = thirdPartySecretInfoVO.getTheirDataSecretIv(); + String urlAddress = thirdPartySecretInfoVO.getTheirUrlPrefix(); String url = urlAddress + "notification_connector_charge_status";