update 内蒙古平台Service

This commit is contained in:
Lemon
2025-04-08 15:52:32 +08:00
parent b641e5cb86
commit 62e7badbdd
2 changed files with 16 additions and 12 deletions

View File

@@ -134,7 +134,7 @@ public class ChargeAlgorithmService {
data.setChargingDetailInfo(chargingDetailInfos); data.setChargingDetailInfo(chargingDetailInfos);
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
jsonObject.put("dataJason", data); jsonObject.put("dataJson", data);
log.info("发送请求前封装数据 data:{}", JSON.toJSONString(jsonObject)); log.info("发送请求前封装数据 data:{}", JSON.toJSONString(jsonObject));

View File

@@ -200,7 +200,8 @@ public class NeiMengGuPlatformServiceImpl implements ThirdPartyPlatformService {
map.put("ItemSize", pageInfo.getTotal()); map.put("ItemSize", pageInfo.getTotal());
map.put("OperatorInfos", operatorInfos); map.put("OperatorInfos", operatorInfos);
Map<String, String> resultMap = ThirdPartyPlatformUtils.generateResultMap(map, thirdPartySecretInfoVO); Map<String, String> resultMap = ThirdPartyPlatformUtils.generateResultMapV2(map, thirdPartySecretInfoVO.getOurDataSecret(),
thirdPartySecretInfoVO.getOurDataSecretIv(), thirdPartySecretInfoVO.getTheirSigSecret());
return resultMap; return resultMap;
} }
@@ -303,7 +304,8 @@ public class NeiMengGuPlatformServiceImpl implements ThirdPartyPlatformService {
map.put("PageCount", pageInfo.getPages()); map.put("PageCount", pageInfo.getPages());
map.put("ItemSize", pageInfo.getTotal()); map.put("ItemSize", pageInfo.getTotal());
map.put("StationInfos", resultList); map.put("StationInfos", resultList);
Map<String, String> resultMap = ThirdPartyPlatformUtils.generateResultMap(map, thirdPartySecretInfoVO); Map<String, String> resultMap = ThirdPartyPlatformUtils.generateResultMapV2(map, thirdPartySecretInfoVO.getOurDataSecret(),
thirdPartySecretInfoVO.getOurDataSecretIv(), thirdPartySecretInfoVO.getTheirSigSecret());
return resultMap; return resultMap;
} }
@@ -409,7 +411,8 @@ public class NeiMengGuPlatformServiceImpl implements ThirdPartyPlatformService {
// map.put("Total", total); // map.put("Total", total);
map.put("StationStatusInfos", collect); map.put("StationStatusInfos", collect);
Map<String, String> resultMap = ThirdPartyPlatformUtils.generateResultMap(map, thirdPartySecretInfoVO); Map<String, String> resultMap = ThirdPartyPlatformUtils.generateResultMapV2(map, thirdPartySecretInfoVO.getOurDataSecret(),
thirdPartySecretInfoVO.getOurDataSecretIv(), thirdPartySecretInfoVO.getTheirSigSecret());
return resultMap; return resultMap;
} }
@@ -460,7 +463,8 @@ public class NeiMengGuPlatformServiceImpl implements ThirdPartyPlatformService {
// 结果集 // 结果集
Map<String, Object> map = Maps.newHashMap(); Map<String, Object> map = Maps.newHashMap();
map.put("StationStatusInfos", stationStatusInfos); map.put("StationStatusInfos", stationStatusInfos);
Map<String, String> resultMap = ThirdPartyPlatformUtils.generateResultMap(map, thirdPartySecretInfoVO); Map<String, String> resultMap = ThirdPartyPlatformUtils.generateResultMapV2(map, thirdPartySecretInfoVO.getOurDataSecret(),
thirdPartySecretInfoVO.getOurDataSecretIv(), thirdPartySecretInfoVO.getTheirSigSecret());
return resultMap; return resultMap;
} }
@@ -483,7 +487,7 @@ public class NeiMengGuPlatformServiceImpl implements ThirdPartyPlatformService {
// 查询相关配置信息 // 查询相关配置信息
ThirdPartySecretInfoVO thirdPartySecretInfoVO = getNeiMengGuPlatformSecretInfo(); ThirdPartySecretInfoVO thirdPartySecretInfoVO = getNeiMengGuPlatformSecretInfo();
String operatorId = thirdPartySecretInfoVO.getTheirOperatorId(); String operatorId = Constants.OPERATORID_LIANLIAN;
String operatorSecret = thirdPartySecretInfoVO.getTheirOperatorSecret(); String operatorSecret = thirdPartySecretInfoVO.getTheirOperatorSecret();
String signSecret = thirdPartySecretInfoVO.getTheirSigSecret(); String signSecret = thirdPartySecretInfoVO.getTheirSigSecret();
String dataSecret = thirdPartySecretInfoVO.getTheirDataSecret(); String dataSecret = thirdPartySecretInfoVO.getTheirDataSecret();
@@ -536,7 +540,7 @@ public class NeiMengGuPlatformServiceImpl implements ThirdPartyPlatformService {
.build(); .build();
// 调用联联平台接口 // 调用联联平台接口
String operatorId = secretInfoVO.getTheirOperatorId(); String operatorId = Constants.OPERATORID_LIANLIAN;
String operatorSecret = secretInfoVO.getTheirOperatorSecret(); String operatorSecret = secretInfoVO.getTheirOperatorSecret();
String signSecret = secretInfoVO.getTheirSigSecret(); String signSecret = secretInfoVO.getTheirSigSecret();
String dataSecret = secretInfoVO.getTheirDataSecret(); String dataSecret = secretInfoVO.getTheirDataSecret();
@@ -635,7 +639,7 @@ public class NeiMengGuPlatformServiceImpl implements ThirdPartyPlatformService {
// 查询相关配置信息 // 查询相关配置信息
ThirdPartySecretInfoVO thirdPartySecretInfoVO = getNeiMengGuPlatformSecretInfo(); ThirdPartySecretInfoVO thirdPartySecretInfoVO = getNeiMengGuPlatformSecretInfo();
String operatorId = thirdPartySecretInfoVO.getTheirOperatorId(); String operatorId = Constants.OPERATORID_LIANLIAN;
String operatorSecret = thirdPartySecretInfoVO.getTheirOperatorSecret(); String operatorSecret = thirdPartySecretInfoVO.getTheirOperatorSecret();
String signSecret = thirdPartySecretInfoVO.getTheirSigSecret(); String signSecret = thirdPartySecretInfoVO.getTheirSigSecret();
String dataSecret = thirdPartySecretInfoVO.getTheirDataSecret(); String dataSecret = thirdPartySecretInfoVO.getTheirDataSecret();
@@ -696,7 +700,7 @@ public class NeiMengGuPlatformServiceImpl implements ThirdPartyPlatformService {
// return null; // return null;
// } // }
String operatorId = secretInfoVO.getTheirOperatorId(); String operatorId = Constants.OPERATORID_LIANLIAN;
String operatorSecret = secretInfoVO.getTheirOperatorSecret(); String operatorSecret = secretInfoVO.getTheirOperatorSecret();
String signSecret = secretInfoVO.getTheirSigSecret(); String signSecret = secretInfoVO.getTheirSigSecret();
String dataSecret = secretInfoVO.getTheirDataSecret(); String dataSecret = secretInfoVO.getTheirDataSecret();
@@ -757,7 +761,7 @@ public class NeiMengGuPlatformServiceImpl implements ThirdPartyPlatformService {
// 查询相关配置信息 // 查询相关配置信息
ThirdPartySecretInfoVO thirdPartySecretInfoVO = getNeiMengGuPlatformSecretInfo(); ThirdPartySecretInfoVO thirdPartySecretInfoVO = getNeiMengGuPlatformSecretInfo();
String operatorId = thirdPartySecretInfoVO.getTheirOperatorId(); String operatorId = Constants.OPERATORID_LIANLIAN;
String operatorSecret = thirdPartySecretInfoVO.getTheirOperatorSecret(); String operatorSecret = thirdPartySecretInfoVO.getTheirOperatorSecret();
String signSecret = thirdPartySecretInfoVO.getTheirSigSecret(); String signSecret = thirdPartySecretInfoVO.getTheirSigSecret();
String dataSecret = thirdPartySecretInfoVO.getTheirDataSecret(); String dataSecret = thirdPartySecretInfoVO.getTheirDataSecret();
@@ -816,7 +820,7 @@ public class NeiMengGuPlatformServiceImpl implements ThirdPartyPlatformService {
// 查询相关配置信息 // 查询相关配置信息
ThirdPartySecretInfoVO thirdPartySecretInfoVO = getNeiMengGuPlatformSecretInfo(); ThirdPartySecretInfoVO thirdPartySecretInfoVO = getNeiMengGuPlatformSecretInfo();
String operatorId = thirdPartySecretInfoVO.getTheirOperatorId(); String operatorId = Constants.OPERATORID_LIANLIAN;
String operatorSecret = thirdPartySecretInfoVO.getTheirOperatorSecret(); String operatorSecret = thirdPartySecretInfoVO.getTheirOperatorSecret();
String signSecret = thirdPartySecretInfoVO.getTheirSigSecret(); String signSecret = thirdPartySecretInfoVO.getTheirSigSecret();
String dataSecret = thirdPartySecretInfoVO.getTheirDataSecret(); String dataSecret = thirdPartySecretInfoVO.getTheirDataSecret();
@@ -954,7 +958,7 @@ public class NeiMengGuPlatformServiceImpl implements ThirdPartyPlatformService {
if (thirdPartySecretInfoVO == null) { if (thirdPartySecretInfoVO == null) {
throw new BusinessException(ReturnCodeEnum.CODE_SELECT_INFO_IS_NULL); throw new BusinessException(ReturnCodeEnum.CODE_SELECT_INFO_IS_NULL);
} }
thirdPartySecretInfoVO.setOurOperatorId(Constants.OPERATORID_JIANG_SU); thirdPartySecretInfoVO.setOurOperatorId(Constants.OPERATORID_LIANLIAN);
return thirdPartySecretInfoVO; return thirdPartySecretInfoVO;
} }