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

update

Browse Source
This commit is contained in:
YAS\29473
2025-07-07 17:33:55 +08:00
parent caf20dc6ec
commit e40cdbe8a7
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/SiChuanPlatformServiceImpl.java vendored
View File

@@ -288,10 +288,13 @@ public class SiChuanPlatformServiceImpl implements ThirdPartyPlatformService {
GeoCodeInfo geoCode = TermRelationTreeCoordinate.completeGeoCode(pileStationInfo.getAddress()); GeoCodeInfo geoCode = TermRelationTreeCoordinate.completeGeoCode(pileStationInfo.getAddress());
if (geoCode != null) { if (geoCode != null) {
//充换电站所在县以下行政区划代码 //充换电站所在县以下行政区划代码
stationInfo.setAreaCodeCountryside(geoCode.getCounty_code()); stationInfo.setAreaCodeCountryside(geoCode.getTown_code());
}else{ }else{
stationInfo.setAreaCodeCountryside("12345678901"); stationInfo.setAreaCodeCountryside("12345678901");
} }
if (StringUtils.isBlank(stationInfo.getAreaCodeCountryside())){
stationInfo.setAreaCodeCountryside("12345678901");
}
stationInfo.setAddress(pileStationInfo.getAddress()); stationInfo.setAddress(pileStationInfo.getAddress());
stationInfo.setServiceTel(pileStationInfo.getStationTel()); stationInfo.setServiceTel(pileStationInfo.getStationTel());
stationInfo.setStationClassification(Constants.one); //站点分类,只填1:充电站 stationInfo.setStationClassification(Constants.one); //站点分类,只填1:充电站
@@ -396,12 +399,6 @@ public class SiChuanPlatformServiceImpl implements ThirdPartyPlatformService {
String dataSecretIv = thirdPartySecretInfoVO.getTheirDataSecretIv(); String dataSecretIv = thirdPartySecretInfoVO.getTheirDataSecretIv();
String urlAddress = thirdPartySecretInfoVO.getTheirUrlPrefix(); String urlAddress = thirdPartySecretInfoVO.getTheirUrlPrefix();
String operatorId1 = "MA01H3BQ2";
String operatorSecret1 = thirdPartySecretInfoVO.getOurOperatorSecret();
String dataSecret1 = thirdPartySecretInfoVO.getOurDataSecret();
String dataSecretIv1 = thirdPartySecretInfoVO.getOurDataSecretIv();
String signSecret1 = thirdPartySecretInfoVO.getOurSigSecret();
// 组装中电联平台所需要的数据格式 // 组装中电联平台所需要的数据格式
SupStationInfoDTO info = SupStationInfoDTO.builder() SupStationInfoDTO info = SupStationInfoDTO.builder()
@@ -477,10 +474,14 @@ public class SiChuanPlatformServiceImpl implements ThirdPartyPlatformService {
GeoCodeInfo geoCode = TermRelationTreeCoordinate.completeGeoCode(pileStationInfo.getAddress()); GeoCodeInfo geoCode = TermRelationTreeCoordinate.completeGeoCode(pileStationInfo.getAddress());
if (geoCode != null) { if (geoCode != null) {
//充换电站所在县以下行政区划代码 //充换电站所在县以下行政区划代码
info.setAreaCodeCountryside(geoCode.getCounty_code()); info.setAreaCodeCountryside(geoCode.getTown_code());
}else{ }else{
info.setAreaCodeCountryside("12345678901"); info.setAreaCodeCountryside("12345678901");
} }
//不允许空字符串和null值
if (StringUtils.isBlank(info.getAreaCodeCountryside())){
info.setAreaCodeCountryside("12345678901");
}
// 截取运营商组织机构代码(去除最后一位后的最后九位) // 截取运营商组织机构代码(去除最后一位后的最后九位)
MerchantInfoVO merchantInfo = pileMerchantInfoService.getMerchantInfoVO(String.valueOf(pileStationInfo.getMerchantId())); MerchantInfoVO merchantInfo = pileMerchantInfoService.getMerchantInfoVO(String.valueOf(pileStationInfo.getMerchantId()));
String organizationCode = merchantInfo.getOrganizationCode(); String organizationCode = merchantInfo.getOrganizationCode();
@@ -1241,7 +1242,7 @@ public class SiChuanPlatformServiceImpl implements ThirdPartyPlatformService {
connectorInfo.setPower(new BigDecimal(pileDetailInfoVO.getRatedPower()).setScale(4, RoundingMode.HALF_UP)); connectorInfo.setPower(new BigDecimal(pileDetailInfoVO.getRatedPower()).setScale(4, RoundingMode.HALF_UP));
connectorInfo.setNationalStandard(2); connectorInfo.setNationalStandard(2);
connectorInfo.setAuxPower(3); // 3-兼容12V和24V connectorInfo.setAuxPower(3); // 3-兼容12V和24V
connectorInfo.setOperateStatus(50); // 50-正常使用 connectorInfo.setOpreateStatus(50); // 50-正常使用
/* if (!StringUtils.equals(pileDetailInfoVO.getConnectorNum(), "1")) { /* if (!StringUtils.equals(pileDetailInfoVO.getConnectorNum(), "1")) {
// 如果不是单枪，则枪口功率需要除以枪口数量 // 如果不是单枪，则枪口功率需要除以枪口数量