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:
yuyang 2021-08-06 11:03:11 +08:00
parent f028580572
commit b295ec8bcf
4 changed files with 52 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/HxpcChargeOrderController.java
View File

@ -41,8 +41,12 @@ public class HxpcChargeOrderController extends BaseController {
}
/**
* 启动充电
* @param userId
* @param serialNumber 终端编码
* @return
*/
@GetMapping("/startUp")
public AjaxResult startUp(@RequestParam Long userId,@RequestParam String serialNumber){
@ -50,5 +54,16 @@ public class HxpcChargeOrderController extends BaseController {
}
/**
* 停止充电
* @param userId
* @param serialNumber 终端编码
* @param chargingOrderId 充电id
* @return
*/
@GetMapping("/stopUp")
public AjaxResult stopUp(@RequestParam Long userId,@RequestParam String serialNumber,@RequestParam Long chargingOrderId){
return iHxpcChargeOrderService.stopUp(userId, serialNumber,chargingOrderId);
}
}

8
xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderController.java
View File

@ -38,11 +38,17 @@ public class XhpcHistoryOrderController extends BaseController {
return getDataTable(list);
}
/**
* 用户订单详情接口
* @param userId 用户id
* @param historyOrderId 历史订单id
* @param type 1 历史订单id 2 充电订单id
* @param chargingOrderId 充电订单id
* @return
*/
@GetMapping("/gethistotyOrderMessage")
public AjaxResult gethistotyOrderMessage(@RequestParam Long userId,@RequestParam Long historyOrderId)
public AjaxResult gethistotyOrderMessage(@RequestParam Long userId,@RequestParam Long historyOrderId,Integer type,Long chargingOrderId)
{
return xhpcHistoryOrderService.gethistotyOrderMessage(userId,historyOrderId);
}

9
xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IHxpcChargeOrderService.java
View File

@ -25,7 +25,16 @@ public interface IHxpcChargeOrderService {
/**
* 启动充电
* @param userId
* @param serialNumber 终端编码
* @return
*/
AjaxResult startUp(Long userId,String serialNumber);
/**
* 停止充电
* @param userId
* @param serialNumber 终端编码
* @return
*/
AjaxResult stopUp(Long userId,String serialNumber,Long chargingOrderId);
}

21
xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/HxpcChargeOrderServiceImpl.java
View File

@ -113,4 +113,25 @@ public class HxpcChargeOrderServiceImpl implements IHxpcChargeOrderService {
return AjaxResult.success();
}
@Override
public AjaxResult stopUp(Long userId, String serialNumber,Long chargingOrderId) {
String pattern = "^([0-9]{16})";
Pattern compile = Pattern.compile(pattern);
Matcher m = compile.matcher(serialNumber);
if (serialNumber.length()!=16 || !m.matches()) {
return AjaxResult.error(1104, "无效的终端编号");
}
//终端信息
XhpcTerminal xhpcTerminal = hxpcChargeOrderMapper.getXhpcTerminalSerialNumber(serialNumber);
if (xhpcTerminal == null || xhpcTerminal.getTerminalId() == null || xhpcTerminal.getChargingPileId() == null || xhpcTerminal.getPileSerialNumber() == null) {
return AjaxResult.error(1104, "无效的终端编号");
}
R oa = powerPileService.stopCharging(xhpcTerminal.getPileSerialNumber(), xhpcTerminal.getSerialNumber(), "OA");
if(oa.getCode() !=200){
return AjaxResult.error(oa.getMsg());
}
return AjaxResult.success();
}
}