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

WIP:三方对接逻辑

Browse Source
This commit is contained in:
ZZ 2021-11-10 20:32:44 +08:00
parent aa93392680
commit 63227d69b8
6 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryEquipChargeStatusController.java
View File

@ -90,7 +90,7 @@ public class QueryEquipChargeStatusController {
equipChargeStatus.setConnectorStatus(connectorStatus); equipChargeStatus.setConnectorStatus(connectorStatus);
//A相电流 //A相电流
String current = (String) cacheGunData.get("current"); String current = (String) cacheGunData.get("current");
Double currentA = Double.valueOf(current); Double currentA = Double.valueOf(current); // todo 16-base/10
equipChargeStatus.setCurrentA(currentA); equipChargeStatus.setCurrentA(currentA);
//A相电压 //A相电压
String voltage = (String) cacheGunData.get("voltage"); String voltage = (String) cacheGunData.get("voltage");

2
evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryStopChargeController.java
View File

@ -126,7 +126,7 @@ public class QueryStopChargeController {
commonResponse.setRet("1"); commonResponse.setRet("1");
commonResponse.setMsg("请求停止充电失败"); commonResponse.setMsg("请求停止充电失败");
commonResponse.setData(data); commonResponse.setData(data);
return commonResponse;
} }
//设置该订单已经被停止的标识 //设置该订单已经被停止的标识

4
xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/PowerPileService.java
View File

@ -23,9 +23,9 @@ public interface PowerPileService {
@PostMapping("/charging/balance/refresh") @PostMapping("/charging/balance/refresh")
R refreshBalance(@Validated @RequestBody StartChargingData balanceRefreshData); R refreshBalance(@Validated @RequestBody StartChargingData balanceRefreshData);
@PutMapping("charging/stop/{orderNo}/{pileNo}/{gunId}/{version}") @PutMapping("charging/stop/{orderNo}/{pileNo}/{connectorId}/{version}")
R stopCharging(@PathVariable("orderNo") String orderNo, @PathVariable("pileNo") String pileNo, R stopCharging(@PathVariable("orderNo") String orderNo, @PathVariable("pileNo") String pileNo,
@PathVariable("gunId") String gunId, @PathVariable("version") String version); @PathVariable("connectorId") String connectorId, @PathVariable("version") String version);
@PostMapping("/pile/whitelist/add/{stationId}/{version}") @PostMapping("/pile/whitelist/add/{stationId}/{version}")
R addPileWhitelist(@PathVariable("stationId") Long stationId, R addPileWhitelist(@PathVariable("stationId") Long stationId,

2
xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/PowerPileFallbackFactory.java
View File

@ -35,7 +35,7 @@ public class PowerPileFallbackFactory implements FallbackFactory<PowerPileServic
} }
@Override @Override
public R stopCharging(String orderNo, String pileNo, String gunId, String version) { public R stopCharging(String orderNo, String pileNo, String connectorId, String version) {
return R.fail("停止充电失败:" + cause.getMessage()); return R.fail("停止充电失败:" + cause.getMessage());
} }

3
xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java
View File

@ -263,7 +263,8 @@ public class XhpcChargeOrderServiceImpl implements IXhpcChargeOrderService {
XhpcChargeOrder order = xhpcChargeOrderMapper.getChargingOrderId(chargingOrderId); XhpcChargeOrder order = xhpcChargeOrderMapper.getChargingOrderId(chargingOrderId);
R oa = powerPileService.stopCharging(order.getSerialNumber(),xhpcTerminal.getPileSerialNumber(), xhpcTerminal.getSerialNumber().substring(14), version); R oa = powerPileService.stopCharging(order.getSerialNumber(), xhpcTerminal.getPileSerialNumber(),
xhpcTerminal.getSerialNumber(), version);
logger.info("<<<<<<<<<<<<<<<<<<<<<<<<停止充电返回>>>>>>>>>>>>>>>>>"); logger.info("<<<<<<<<<<<<<<<<<<<<<<<<停止充电返回>>>>>>>>>>>>>>>>>");
logger.info("<<<<<<<<<<<<<<<<<<<<<<<<"+oa.getCode()+">>>>>>>>>>>>>>>>>"); logger.info("<<<<<<<<<<<<<<<<<<<<<<<<"+oa.getCode()+">>>>>>>>>>>>>>>>>");
logger.info("<<<<<<<<<<<<<<<<<<<<<<<<"+oa.getMsg()+">>>>>>>>>>>>>>>>>"); logger.info("<<<<<<<<<<<<<<<<<<<<<<<<"+oa.getMsg()+">>>>>>>>>>>>>>>>>");

8
xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java
View File

@ -132,9 +132,9 @@ public class ChargingController {
return R.ok(); return R.ok();
} }
@PutMapping("charging/stop/{orderNo}/{pileNo}/{gunId}/{version}") @PutMapping("charging/stop/{orderNo}/{pileNo}/{connectorId}/{version}")
public R stopCharging(@PathVariable("orderNo") String orderNo, @PathVariable("pileNo") String pileNo, public R stopCharging(@PathVariable("orderNo") String orderNo, @PathVariable("pileNo") String pileNo,
@PathVariable("gunId") String gunId, @PathVariable("connectorId") String connectorId,
@PathVariable( @PathVariable(
"version") String version) { "version") String version) {
@ -148,7 +148,7 @@ public class ChargingController {
if (!REGISTERED.equals(status)) { if (!REGISTERED.equals(status)) {
r = R.fail("充电桩离线"); r = R.fail("充电桩离线");
} }
String gunkey = pkey.concat(gunId).replace("pile", "gun"); String gunkey = "gun:".concat(connectorId);
final Map<String, Object> cacheGun = REDIS.getCacheMap(gunkey); final Map<String, Object> cacheGun = REDIS.getCacheMap(gunkey);
if (cacheGun.get("orderkey") == null || !cacheGun.get("orderkey").toString().endsWith(orderNo) || !orderNo.contains(pileNo)) { if (cacheGun.get("orderkey") == null || !cacheGun.get("orderkey").toString().endsWith(orderNo) || !orderNo.contains(pileNo)) {
r = R.fail("错误的订单号"); r = R.fail("错误的订单号");
@ -160,7 +160,7 @@ public class ChargingController {
String response = HttpUtils.get(fmt(svcSrv) String response = HttpUtils.get(fmt(svcSrv)
.concat("/native/charging/stop/") .concat("/native/charging/stop/")
.concat(pileNo).concat("/") .concat(pileNo).concat("/")
.concat(gunId).concat("/") .concat(connectorId).concat("/")
.concat(version)); .concat(version));
r = getRR(response); r = getRR(response);
} }