From 9bf5df94f1a8ae360ccb07a54031eead9132de23 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期五, 18 三月 2022 14:16:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3ChargingController.java |  106 ++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 96 insertions(+), 10 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 69793a0..a745dec 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
@@ -1,14 +1,12 @@
 package com.sandu.ximon.admin.controller;
 
 import com.sandu.common.domain.ResponseVO;
+import com.sandu.common.object.BaseConditionVO;
 import com.sandu.common.util.ResponseUtil;
 import com.sandu.ximon.admin.param.C3ChargingParam;
 import com.sandu.ximon.admin.service.C3ChargingService;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * @author ZZQ
@@ -22,14 +20,24 @@
 public class C3ChargingController {
     private C3ChargingService c3ChargingService;
 
+
+    @GetMapping("/C3ChargingList")
+    public ResponseVO<Object> C3ChargingList(BaseConditionVO baseConditionVO) {
+        return ResponseUtil.successPage(c3ChargingService.getC3ChargingList(baseConditionVO));
+    }
+
     /**
      * 鍏呯數寮�鍚�
      */
     @PostMapping("/startCharging")
     public ResponseVO<Object> startCharging(@RequestBody C3ChargingParam c3ChargingParam) {
-        c3ChargingService.startCharging(c3ChargingParam.getC3Mac(), c3ChargingParam.getChargingCapacity(), c3ChargingParam.getChargeAmount());
+        String result = c3ChargingService.startCharging(c3ChargingParam.getC3Mac(), c3ChargingParam.getChargingCapacity(), c3ChargingParam.getChargeAmount());
+        if ("鎿嶄綔鎴愬姛".equals(result)) {
+            return ResponseUtil.success(result);
+        } else {
+            return ResponseUtil.fail(result);
+        }
 
-        return ResponseUtil.success(null);
     }
 
     /**
@@ -37,9 +45,83 @@
      */
     @PostMapping("/finishCharging")
     public ResponseVO<Object> finishCharging(@RequestBody C3ChargingParam c3ChargingParam) {
-        c3ChargingService.finishCharging(c3ChargingParam.getC3Mac());
+        String result = c3ChargingService.finishCharging(c3ChargingParam.getC3Mac());
 
-        return ResponseUtil.success(null);
+        if ("鎿嶄綔鎴愬姛".equals(result)) {
+            return ResponseUtil.success(result);
+        } else {
+            return ResponseUtil.fail(result);
+        }
+    }
+
+    /**
+     * 鍚屾缁撴潫
+     */
+    @PostMapping("/EndOfTheSynchronization")
+    public ResponseVO<Object> EndOfTheSynchronization(@RequestBody C3ChargingParam c3ChargingParam) {
+        String result = c3ChargingService.EndOfTheSynchronization(c3ChargingParam.getC3Mac());
+
+        if ("鎿嶄綔鎴愬姛".equals(result)) {
+            return ResponseUtil.success(result);
+        } else {
+            return ResponseUtil.fail(result);
+        }
+    }
+
+    /**
+     * 鏌ヨ鐗堟湰
+     */
+    @PostMapping("/QueryVersion")
+    public ResponseVO<Object> QueryVersion(@RequestBody C3ChargingParam c3ChargingParam) {
+        String result = c3ChargingService.QueryVersion(c3ChargingParam.getC3Mac());
+
+        if ("鎿嶄綔鎴愬姛".equals(result)) {
+            return ResponseUtil.success(result);
+        } else {
+            return ResponseUtil.fail(result);
+        }
+    }
+
+    /**
+     * 鏌ヨ蹇冭烦鍖呴棿闅旀椂闂�
+     */
+    @PostMapping("/QueryIntervalTime")
+    public ResponseVO<Object> QueryIntervalTime(@RequestBody C3ChargingParam c3ChargingParam) {
+        String result = c3ChargingService.QueryIntervalTime(c3ChargingParam.getC3Mac());
+
+        if ("鎿嶄綔鎴愬姛".equals(result)) {
+            return ResponseUtil.success(result);
+        } else {
+            return ResponseUtil.fail(result);
+        }
+    }
+
+    /**
+     * 鏌ヨ鐢靛帇/鐢垫祦甯告暟
+     */
+    @PostMapping("/QueryConstant")
+    public ResponseVO<Object> QueryConstant(@RequestBody C3ChargingParam c3ChargingParam) {
+        String result = c3ChargingService.QueryConstant(c3ChargingParam.getC3Mac());
+
+        if ("鎿嶄綔鎴愬姛".equals(result)) {
+            return ResponseUtil.success(result);
+        } else {
+            return ResponseUtil.fail(result);
+        }
+    }
+
+    /**
+     * 鏌ヨ鍦板潃
+     */
+    @PostMapping("/QueryAddress")
+    public ResponseVO<Object> QueryAddress(@RequestBody C3ChargingParam c3ChargingParam) {
+        String result = c3ChargingService.QueryAddress(c3ChargingParam.getC3Mac());
+
+        if ("鎿嶄綔鎴愬姛".equals(result)) {
+            return ResponseUtil.success(result);
+        } else {
+            return ResponseUtil.fail(result);
+        }
     }
 
 
@@ -48,8 +130,12 @@
      */
     @PostMapping("/restartCharging")
     public ResponseVO<Object> restartCharging(@RequestBody C3ChargingParam c3ChargingParam) {
-        c3ChargingService.restartCharging(c3ChargingParam.getC3Mac());
+        String result = c3ChargingService.restartCharging(c3ChargingParam.getC3Mac());
 
-        return ResponseUtil.success(null);
+        if ("鎿嶄綔鎴愬姛".equals(result)) {
+            return ResponseUtil.success(result);
+        } else {
+            return ResponseUtil.fail(result);
+        }
     }
 }

--
Gitblit v1.9.3