From f4c9281d1b7f19fef0d8ee7cb03e166a218b33f2 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期四, 05 九月 2024 17:50:33 +0800
Subject: [PATCH] 完善功能

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java |   24 ++++++++++++++++++++++--
 1 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
index 4c1927c..285fcf8 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
@@ -42,6 +42,7 @@
 import com.ruoyi.order.api.query.UploadRealTimeMonitoringDataQuery;
 import com.ruoyi.order.api.vo.ChargingOrderInfoVO;
 import com.ruoyi.order.api.vo.ChargingOrderVO;
+import com.ruoyi.order.api.vo.GetChargingOrderByLicensePlate;
 import com.ruoyi.order.api.vo.TCharingOrderVO;
 import com.ruoyi.order.dto.GetMyChargingOrderList;
 import com.ruoyi.order.dto.GetNoInvoicedOrder;
@@ -792,8 +793,27 @@
      */
     @PostMapping("/endCharge")
     public void endCharge(@RequestParam("code") String code){
-        chargingOrderService.endCharge(code);
+        chargingOrderService.endCharge(code, 2);
     }
     
-
+    /**
+     * 硬件异常结束充电后的处理逻辑
+     * @param code
+     */
+    @PostMapping("/excelEndCharge")
+    public void excelEndCharge(@RequestParam("code") String code){
+        chargingOrderService.excelEndCharge(code);
+    }
+    
+    
+    /**
+     * 根据车牌号和时间查询有效的充电数据
+     * @param query
+     * @return
+     */
+    @PostMapping("/getChargingOrderByLicensePlate")
+    public R<TChargingOrder> getChargingOrderByLicensePlate(@RequestBody GetChargingOrderByLicensePlate query){
+        TChargingOrder chargingOrder = chargingOrderService.getChargingOrderByLicensePlate(query);
+        return R.ok(chargingOrder);
+    }
 }

--
Gitblit v1.7.1