yuyang/XH-Power-Cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

订单回调

Browse Source
This commit is contained in:
ZZ 2021-08-18 16:55:38 +08:00
parent a551e3a531
commit be2be40e9b
5 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/PileOrderFallbackFactory.java
View File

@ -2,7 +2,6 @@ package com.xhpc.common.api.factory;
import com.xhpc.common.api.PileOrderService;
import com.xhpc.common.core.domain.R;
import com.xhpc.common.dto.PileEndOrder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory;
@ -37,7 +36,7 @@ public class PileOrderFallbackFactory implements FallbackFactory<PileOrderServic
@Override
public R pileEndOrder(String orderNo) {
return R.fail("桩订单结束回调接口失败:" + cause.getMessage());
return null;
}
@Override

2
xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OrderDataLogic.java
View File

@ -52,7 +52,7 @@ public class OrderDataLogic implements ServiceLogic {
String seq = seqHex(skey);
String resultStr = "6815".concat(seq).concat("0040").concat(orderNo).concat(ServiceResult.HEX_OK);
resultStr = resultStr.concat(CRCCalculator.calcCrc(resultStr));
return new ServiceResult(HexUtils.toBytes(resultStr), ServiceResult.OK);
return new ServiceResult(HexUtils.toBytes(resultStr), ServiceResult.OK, orderNo);
}
private CacheOrderData translate(OrderData orderData) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException, InstantiationException {

1
xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java
View File

@ -110,6 +110,7 @@ public class RealtimeDataLogic implements ServiceLogic {
cacheOrder.put("realtimeDataList", realtimeDataList);
orderkey = (String) cacheGun.get("orderkey");
REDIS.setCacheMap(orderkey, cacheOrder);
pileOrderService.pileRimeOrder(orderNo);
if ((balance - cacheRealtimeData.getAmountCharged()) < 500) {
String alerted = (String) cacheOrder.get("lt5alerted");
String tel = (String) cacheOrder.get("tel");

4
xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/server/ChargingPileBinaryHandler.java
View File

@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil;
import com.alibaba.nacos.api.exception.NacosException;
import com.xhpc.common.api.PileOrderService;
import com.xhpc.common.api.dto.ChargingStationDto;
import com.xhpc.common.core.domain.R;
import com.xhpc.pp.domain.ServiceField;
import com.xhpc.pp.logic.FieldLogic;
import com.xhpc.pp.logic.ServiceMainLogic;
@ -105,7 +106,8 @@ public class ChargingPileBinaryHandler implements ClientBinaryHandler {
} else if (SERVICE_RMCR.equals(serviceName) && OK.equals(resultCode)) {
setCachePileRM(pilekey);
} else if (SERVICE_OD.equals(serviceName) && OK.equals(resultCode)) {
// pileOrderService.pileEndOrder(); todo
R r = pileOrderService.pileEndOrder(result.getMsg());
if (r.getCode() != 200) return;
}
if (result.getBinary() != null) {
log.info("server send msg >>>> ({}) |{}|", pileNo, toHex(result.getBinary()));

7
xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/tx/ServiceResult.java
View File

@ -48,6 +48,13 @@ public class ServiceResult {
this.code = OK;
}
public ServiceResult(byte[] binary, String code, String msg) {
this.binary = binary;
this.code = code;
this.msg = msg;
}
public ServiceResult(byte[] binary, String code) {
this.binary = binary;