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

update 华为Service

Browse Source
This commit is contained in:
Lemon
2024-04-03 10:56:06 +08:00
parent e00fedd5dd
commit 2b62f01a38
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
View File

@@ -1350,7 +1350,7 @@ public class OrderService {
dto.setStationIds(Lists.newArrayList(stationId)); dto.setStationIds(Lists.newArrayList(stationId));
dto.setPileConnectorCode(orderInfo.getPileConnectorCode()); dto.setPileConnectorCode(orderInfo.getPileConnectorCode());
dto.setThirdPartyType(thirdPartyType); dto.setThirdPartyType(thirdPartyType);
dto.setOrderCode(orderCode);
String result = commonService.commonQueryStartCharge(dto); String result = commonService.commonQueryStartCharge(dto);
log.info("异步判断是否对接第三方平台 stationId:{}, thirdPartyType:{}, result:{}", stationId, thirdPartyType, result); log.info("异步判断是否对接第三方平台 stationId:{}, thirdPartyType:{}, result:{}", stationId, thirdPartyType, result);
} }

1
jsowell-pile/src/main/java/com/jsowell/pile/dto/ThirdPartyCommonStartChargeDTO.java
View File

@@ -13,6 +13,7 @@ import java.util.List;
*/ */
@Data @Data
public class ThirdPartyCommonStartChargeDTO { public class ThirdPartyCommonStartChargeDTO {
private String orderCode;
/** /**
* 第三方平台类型 * 第三方平台类型
*/ */

13
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/huawei/HuaweiServiceV2.java vendored
View File

@@ -520,11 +520,11 @@ public class HuaweiServiceV2 {
String requestName = "query_start_charge"; String requestName = "query_start_charge";
// 生成订单 // 生成订单
String orderCode = IdUtils.getOrderCode(); String orderCode = dto.getStartChargeSeq();
String startChargeSeq = Constants.OPERATORID_JIANG_SU + "_C" + orderCode; // String startChargeSeq = orderCode;
QueryStartChargeDTO startChargeDTO = new QueryStartChargeDTO(); QueryStartChargeDTO startChargeDTO = new QueryStartChargeDTO();
startChargeDTO.setOperatorId(ThirdPartyOperatorIdEnum.HUA_WEI.getOperatorId()); startChargeDTO.setOperatorId(ThirdPartyOperatorIdEnum.HUA_WEI.getOperatorId());
startChargeDTO.setStartChargeSeq(startChargeSeq); startChargeDTO.setStartChargeSeq(orderCode);
startChargeDTO.setConnectorID(pileConnectorCode); startChargeDTO.setConnectorID(pileConnectorCode);
startChargeDTO.setAccountBalance(chargeAmount); startChargeDTO.setAccountBalance(chargeAmount);
startChargeDTO.setPayMode(dto.getPayMode()); startChargeDTO.setPayMode(dto.getPayMode());
@@ -536,7 +536,7 @@ public class HuaweiServiceV2 {
} }
// 拼装参数 // 拼装参数
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
jsonObject.put("StartChargeSeq", startChargeSeq); jsonObject.put("StartChargeSeq", orderCode);
jsonObject.put("ConnectorID", pileConnectorCode); jsonObject.put("ConnectorID", pileConnectorCode);
jsonObject.put("MoneyLimit", chargeAmount); jsonObject.put("MoneyLimit", chargeAmount);
@@ -968,6 +968,7 @@ public class HuaweiServiceV2 {
chargeDTO.setConnectorID(pileConnectorCode); chargeDTO.setConnectorID(pileConnectorCode);
chargeDTO.setMoneyLimit(chargeAmount); chargeDTO.setMoneyLimit(chargeAmount);
chargeDTO.setPayMode(payMode); chargeDTO.setPayMode(payMode);
chargeDTO.setStartChargeSeq(dto.getOrderCode());
QueryStartChargeVO startChargeVO = queryStartCharge(chargeDTO); QueryStartChargeVO startChargeVO = queryStartCharge(chargeDTO);
if (startChargeVO.getSuccStat() != Constants.zero) { if (startChargeVO.getSuccStat() != Constants.zero) {
log.error(label + "请求启动充电 error, {}", startChargeVO.getFailReason()); log.error(label + "请求启动充电 error, {}", startChargeVO.getFailReason());
@@ -977,8 +978,8 @@ public class HuaweiServiceV2 {
// Threads.sleep(5000); // Threads.sleep(5000);
// query_equip_charge_status 查询设备充电状态 // query_equip_charge_status 查询设备充电状态
QueryChargeStatusVO chargeStatusVO = new QueryChargeStatusVO(); QueryChargeStatusVO chargeStatusVO = new QueryChargeStatusVO();
for (int i = 1; i <= 3; i ++) { for (int i = 1; i <= 10; i ++) {
// 循环 3 次，每次延时5s，查询充电状态 // 循环 10 次，每次延时5s，查询充电状态
Threads.sleep(5000); Threads.sleep(5000);
chargeStatusVO = queryChargeStatus(startChargeSeq); chargeStatusVO = queryChargeStatus(startChargeSeq);
if (chargeStatusVO != null) { if (chargeStatusVO != null) {