From d82fc07d4280d5566d6470e9584f1e5007eda26f Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 11 九月 2024 17:41:17 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java
index ab353e2..79acf34 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java
@@ -25,6 +25,7 @@
import com.ruoyi.common.log.enums.OperatorType;
import com.ruoyi.integration.api.feignClient.IntegrationClient;
import com.ruoyi.integration.api.model.EndCharge;
+import com.ruoyi.order.api.feignClient.ChargingOrderClient;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -57,6 +58,8 @@
@Autowired
private TChargingGunService chargingGunService;
+ @Autowired
+ private ChargingOrderClient chargingOrderClient;
@Resource
private TChargingPileService chargingPileService;
@@ -130,10 +133,9 @@
@Log(title = "【充电桩信息】结束充电", businessType = BusinessType.OTHER,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-充电枪"},value = "结束充电")
@PutMapping(value = "/stopCharging")
- public AjaxResult<String> stopCharging(@RequestParam("id") Integer id) {
- // TODO 硬件 结束充电
-// EndCharge endCharge = new EndCharge();
-// integrationClient.endCharge(endCharge);
+ public AjaxResult<String> stopCharging(@RequestParam("id") String id) {
+ // 硬件 结束充电
+ chargingOrderClient.stopCharging(id);
return AjaxResult.success();
}
--
Gitblit v1.7.1