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

update 对接内蒙古平台

Browse Source
This commit is contained in:
Guoqs
2024-04-15 15:57:52 +08:00
parent 02a1aa80ee
commit 3526fd8a22
7 changed files with 29 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

136
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java vendored
View File

@@ -30,6 +30,7 @@ import com.jsowell.pile.domain.*;
import com.jsowell.pile.domain.ykcCommond.StartChargingCommand;
import com.jsowell.pile.dto.*;
import com.jsowell.pile.service.*;
import com.jsowell.pile.util.MerchantUtils;
import com.jsowell.pile.vo.base.*;
import com.jsowell.pile.vo.lianlian.AccumulativeInfoVO;
import com.jsowell.pile.vo.lianlian.PushStationFeeVO;
@@ -127,139 +128,8 @@ public class LianLianServiceImpl implements LianLianService {
.OperatorTel1(merchantInfo.getMerchantTel()) // 对接平台客服电话1
.build();
// 调用联联平台接口
}
/**
* 根据站点id推送站点信息 notification_stationInfo
*
* @param dto
*/
// @Override
// public String pushStationInfo(PushStationInfoDTO dto) {
// // String OperatorID = "987654321";
// // String SigSecret = "1234567890abcdef"; // 签名秘钥
// // String DataSecret = "1234567890abcdef"; // 消息密钥
// // String DataSecretIV = "1234567890abcdef"; // 消息密钥初始化向量
// // String token = "c548f9276c1c4ea8b88b1f7b1eb7cf07"; //QueryToken类查询接口获取到的token
//
// // 通过id查询站点相关信息
// PileStationInfo pileStationInfo = pileStationInfoService.selectPileStationInfoById(dto.getStationId());
// // 通过站点id查询相关配置信息
// ThirdPartyStationRelation relation = new ThirdPartyStationRelation();
// relation.setStationId(dto.getStationId());
// ThirdPartyStationRelationVO relationInfo = thirdPartyStationRelationService.selectRelationInfo(relation);
// // ThirdPartySettingInfo settingInfo = thirdPartySettingInfoService.getInfoByStationId(dto.getStationId());
// if (relationInfo == null) {
// // 新增
// relation.setThirdPartyType(dto.getThirdPartyType());
// thirdPartyStationRelationService.insertThirdPartyStationRelation(relation);
//
// relationInfo = thirdPartyStationRelationService.selectRelationInfo(relation);
// }
// String operatorId = relationInfo.getOperatorId();
// String operatorSecret = relationInfo.getOperatorSecret();
// String signSecret = relationInfo.getSignSecret();
// String dataSecret = relationInfo.getDataSecret();
// String dataSecretIv = relationInfo.getDataSecretIv();
// String urlAddress = relationInfo.getUrlAddress();
//
// // 组装联联平台所需要的数据格式
// StationInfo info = StationInfo.builder()
// .stationID("LC" +dto.getStationId())
// .operatorID(operatorId)
// // .equipmentOwnerID(Constants.OPERATORID_LIANLIAN)
// .stationName(pileStationInfo.getStationName())
// .isAloneApply(Integer.valueOf(pileStationInfo.getAloneApply()))
// .isPublicParkingLot(Integer.valueOf(pileStationInfo.getPublicParking()))
// .countryCode(pileStationInfo.getCountryCode())
// // .areaCode(pileStationInfo.getAreaCode())
// .address(pileStationInfo.getAddress())
// .serviceTel(pileStationInfo.getStationTel())
// .stationType(Integer.valueOf(pileStationInfo.getStationType()))
// .stationStatus(Integer.valueOf(pileStationInfo.getStationStatus()))
// .parkNums(Integer.valueOf(pileStationInfo.getParkNums()))
// .stationLng(new BigDecimal(pileStationInfo.getStationLng()))
// .stationLat(new BigDecimal(pileStationInfo.getStationLat()))
// .construction(Integer.valueOf(pileStationInfo.getConstruction()))
// .openAllDay(Integer.valueOf(pileStationInfo.getOpenAllDay()))
// .minElectricityPrice(new BigDecimal(Constants.ZERO))
// .electricityFee(Constants.ZERO)
// .serviceFee(Constants.ZERO)
// .parkFree(Integer.valueOf(pileStationInfo.getParkFree()))
// // .ParkFee("2")
// .supportOrder(Integer.valueOf(pileStationInfo.getSupportOrder()))
// .parkFeeType(0)
// .toiletFlag(Integer.valueOf(pileStationInfo.getToiletFlag()))
// .storeFlag(Integer.valueOf(pileStationInfo.getStoreFlag()))
// .restaurantFlag(Integer.valueOf(pileStationInfo.getRestaurantFlag()))
// .loungeFlag(Integer.valueOf(pileStationInfo.getLoungeFlag()))
// .canopyFlag(Integer.valueOf(pileStationInfo.getCanopyFlag()))
// .printerFlag(Integer.valueOf(pileStationInfo.getPrinterFlag()))
// .barrierFlag(Integer.valueOf(pileStationInfo.getBarrierFlag()))
// .parkingLockFlag(Integer.valueOf(pileStationInfo.getParkingLockFlag()))
//
// .build();
// String areaCode = pileStationInfo.getAreaCode(); // 330000,330200,330213
// // 根据逗号分组
// String[] split = StringUtils.split(areaCode, ",");
// // 只取最后一部分 330213
// String subAreaCode = split[split.length - 1];
// info.setAreaCode(subAreaCode);
// // 截取运营商组织机构代码(去除最后一位后的最后九位)
// MerchantInfoVO merchantInfo = pileMerchantInfoService.getMerchantInfoVO(String.valueOf(pileStationInfo.getMerchantId()));
// String organizationCode = merchantInfo.getOrganizationCode();
// if (StringUtils.isNotBlank(organizationCode) && organizationCode.length() == 18) {
// String equipmentOwnerId = StringUtils.substring(organizationCode, organizationCode.length() - 10, organizationCode.length() - 1);
// info.setEquipmentOwnerID(equipmentOwnerId);
// }
// if (StringUtils.equals("36", String.valueOf(pileStationInfo.getMerchantId()))) {
// // 远大
// info.setEquipmentOwnerID(Constants.OPERATORID_YUAN_DA);
// }
// if (StringUtils.equals("35", String.valueOf(pileStationInfo.getMerchantId()))) {
// // 如果是希晓运营商，则把equipmentOwnerID换成希晓
// info.setEquipmentOwnerID(Constants.OPERATORID_XI_XIAO);
// }
// String payment = StationPaymentEnum.getPaymentByCode(pileStationInfo.getPayment());
// info.setPayment(payment);
// if (StringUtils.isNotBlank(pileStationInfo.getParkingNumber())) {
// info.setIsPublicParkingLot(1);
// info.setParkingLotNumber(pileStationInfo.getParkingNumber());
// }
// // 户号
// if (StringUtils.isNotBlank(pileStationInfo.getAccountNumber())) {
// info.setAccountNumber(pileStationInfo.getAccountNumber());
// }
// // 容量
// if (StringUtils.isNotBlank(String.valueOf(pileStationInfo.getCapacity()))) {
// info.setCapacity(pileStationInfo.getCapacity().setScale(4, BigDecimal.ROUND_HALF_UP));
// }
// List<EquipmentInfo> pileList = getPileList(pileStationInfo);
// if (CollectionUtils.isNotEmpty(pileList)) {
// info.setEquipmentInfos(pileList); // 充电设备信息列表
// }
//
// // 调用联联平台接口
// String url = urlAddress + "notification_stationInfo";
//
// String jsonStr = JSON.toJSONString(info);
// JSONObject data = new JSONObject();
// data.put("StationInfo", jsonStr);
//
// String jsonString = JSON.toJSONString(data);
// System.out.println("jsonString : " + jsonString);
//
// // 获取令牌
// String token = getToken(urlAddress, operatorId, operatorSecret, dataSecretIv, signSecret, dataSecret);
// String result = HttpRequestUtil.sendPost(token, jsonString, url, dataSecret
// , dataSecretIv, operatorId, signSecret);
//
// // System.out.println(result);
// return result;
// }
public String pushStationInfoV2(PushStationInfoDTO dto) {
// 通过id查询站点相关信息
@@ -336,7 +206,7 @@ public class LianLianServiceImpl implements LianLianService {
// 远大
info.setEquipmentOwnerID(Constants.OPERATORID_YUAN_DA);
}
if (StringUtils.equals("35", String.valueOf(pileStationInfo.getMerchantId()))) {
if (MerchantUtils.isXiXiaoMerchant(String.valueOf(pileStationInfo.getMerchantId()))) {
// 如果是希晓运营商，则把equipmentOwnerID换成希晓
info.setEquipmentOwnerID(Constants.OPERATORID_XI_XIAO);
}
@@ -1142,7 +1012,7 @@ public class LianLianServiceImpl implements LianLianService {
.stopReason(0)
// .chargeDetails()
.build();
if (StringUtils.equals("35", orderBasicInfo.getMerchantId())) {
if (MerchantUtils.isXiXiaoMerchant(orderBasicInfo.getMerchantId())) {
orderInfo.setEquipmentOwnerID(Constants.OPERATORID_XI_XIAO);
}
// 支付方式

5
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/lianlian/service/LianLianPlatformServiceImpl.java vendored
View File

@@ -26,6 +26,7 @@ import com.jsowell.pile.dto.QueryStationInfoDTO;
import com.jsowell.pile.service.*;
import com.jsowell.pile.thirdparty.CommonParamsDTO;
import com.jsowell.pile.thirdparty.EquipmentInfo;
import com.jsowell.pile.util.MerchantUtils;
import com.jsowell.pile.vo.base.*;
import com.jsowell.pile.vo.lianlian.AccumulativeInfoVO;
import com.jsowell.pile.vo.lianlian.PushStationFeeVO;
@@ -538,7 +539,7 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService {
// 远大
info.setEquipmentOwnerID(Constants.OPERATORID_YUAN_DA);
}
if (StringUtils.equals("35", String.valueOf(pileStationInfo.getMerchantId()))) {
if (MerchantUtils.isXiXiaoMerchant(String.valueOf(pileStationInfo.getMerchantId()))) {
// 如果是希晓运营商，则把equipmentOwnerID换成希晓
info.setEquipmentOwnerID(Constants.OPERATORID_XI_XIAO);
}
@@ -725,7 +726,7 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService {
.stopReason(0)
// .chargeDetails()
.build();
if (StringUtils.equals("35", orderBasicInfo.getMerchantId())) {
if (MerchantUtils.isXiXiaoMerchant(orderBasicInfo.getMerchantId())) {
orderInfo.setEquipmentOwnerID(Constants.OPERATORID_XI_XIAO);
}
// 支付方式

5
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/neimenggu/service/NeiMengGuPlatformServiceImpl.java vendored
View File

@@ -27,6 +27,7 @@ import com.jsowell.pile.dto.QueryStationInfoDTO;
import com.jsowell.pile.service.*;
import com.jsowell.pile.thirdparty.CommonParamsDTO;
import com.jsowell.pile.thirdparty.EquipmentInfo;
import com.jsowell.pile.util.MerchantUtils;
import com.jsowell.pile.vo.base.ConnectorInfoVO;
import com.jsowell.pile.vo.base.ThirdPartyStationInfoVO;
import com.jsowell.pile.vo.base.ThirdPartyStationRelationVO;
@@ -408,7 +409,7 @@ public class NeiMengGuPlatformServiceImpl implements ThirdPartyPlatformService {
ChargeOrderInfo orderInfo = transformChargeOrderInfo(orderBasicInfo, orderDetail);
orderInfo.setOperatorID(operatorId);
String equipmentOwnerID;
if (StringUtils.equals("35", orderBasicInfo.getMerchantId())) {
if (MerchantUtils.isXiXiaoMerchant(orderBasicInfo.getMerchantId())) {
equipmentOwnerID = Constants.OPERATORID_XI_XIAO;
} else {
equipmentOwnerID = Constants.OPERATORID_LIANLIAN;
@@ -533,7 +534,7 @@ public class NeiMengGuPlatformServiceImpl implements ThirdPartyPlatformService {
ChargeOrderInfo orderInfo = transformChargeOrderInfo(orderBasicInfo, orderDetail);
orderInfo.setOperatorID(operatorId);
String equipmentOwnerID;
if (StringUtils.equals("35", orderBasicInfo.getMerchantId())) {
if (MerchantUtils.isXiXiaoMerchant(orderBasicInfo.getMerchantId())) {
equipmentOwnerID = Constants.OPERATORID_XI_XIAO;
} else {
equipmentOwnerID = Constants.OPERATORID_LIANLIAN;