From 46367116aef9a54c43c9348e095d62105f16aebe Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期四, 05 九月 2024 17:54:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java |   26 ++++++++++++++++++++++++++
 1 files changed, 26 insertions(+), 0 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java
index 11fe605..366a8c3 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java
@@ -11,6 +11,7 @@
 import com.ruoyi.order.api.query.UploadRealTimeMonitoringDataQuery;
 import com.ruoyi.order.api.vo.ChargingBillVO;
 import io.swagger.annotations.ApiOperation;
+import com.ruoyi.order.api.vo.GetChargingOrderByLicensePlate;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
@@ -79,4 +80,29 @@
      */
     @PostMapping(value = "/t-charging-order/getOrderByCode/{code}")
     R<TChargingOrder> getOrderByCode(@PathVariable("code") String code);
+    
+    
+    /**
+     * 充电解释后处理逻辑
+     * @param code
+     */
+    @PostMapping("/t-charging-order/endCharge")
+    void endCharge(@RequestParam("code") String code);
+    
+    
+    /**
+     * 硬件异常结束充电后的处理逻辑
+     * @param code
+     */
+    @PostMapping("/t-charging-order/excelEndCharge")
+    void excelEndCharge(@RequestParam("code") String code);
+    
+    
+    /**
+     * 根据车牌号和时间查询有效的充电数据
+     * @param query
+     * @return
+     */
+    @PostMapping("/t-charging-order/getChargingOrderByLicensePlate")
+    R<TChargingOrder> getChargingOrderByLicensePlate(@RequestBody GetChargingOrderByLicensePlate query);
 }

--
Gitblit v1.7.1