From 798400ebc4769a6afec56ebbf8198e87e6c1a683 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 12 八月 2022 18:16:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3ChargingController.java |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3ChargingController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3ChargingController.java
index c464144..d873eb4 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3ChargingController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3ChargingController.java
@@ -44,20 +44,20 @@
         return ResponseUtil.success(c3ChargingService.getChargingInfo(poleId));
     }
 
-//    /**
-//     * 鍏呯數寮�鍚�
-//     */
-//    @AnonymousAccess
-//    @PostMapping("/startCharging")
-//    public ResponseVO<Object> startCharging(@RequestBody C3ChargingParam c3ChargingParam) {
-//        String result = c3ChargingService.startCharging(c3ChargingParam.getC3Mac(), c3ChargingParam.getChargingCapacity(), c3ChargingParam.getChargeAmount());
-//        if ("鎿嶄綔鎴愬姛".equals(result)) {
-//            return ResponseUtil.success(result);
-//        } else {
-//            return ResponseUtil.fail(result);
-//        }
-//
-//    }
+    /**
+     * 鍏呯數寮�鍚�
+     */
+    @AnonymousAccess
+    @PostMapping("/startCharging")
+    public ResponseVO<Object> startCharging(@RequestBody C3ChargingParam c3ChargingParam) {
+        String result = c3ChargingService.startCharging(c3ChargingParam.getC3Mac(), c3ChargingParam.getChargingCapacity(), c3ChargingParam.getChargeAmount());
+        if ("鎿嶄綔鎴愬姛".equals(result)) {
+            return ResponseUtil.success(result);
+        } else {
+            return ResponseUtil.fail(result);
+        }
+
+    }
 
     /**
      * 鍏呯數缁撴潫鈥斺�斿皬绋嬪簭鐢ㄦ埛缁撴潫锛屼笉闇�瑕乼oken锛岄渶瑕乷penId

--
Gitblit v1.9.3