From fffec2f9811bb15f37b3725c05d4fac123943816 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 29 三月 2022 18:30:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3ChargingController.java |   68 ++++++++++++++++++++++++++++++++++
 1 files changed, 68 insertions(+), 0 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 70c7c39..e2e5750 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
@@ -3,6 +3,7 @@
 import com.sandu.common.domain.ResponseVO;
 import com.sandu.common.object.BaseConditionVO;
 import com.sandu.common.util.ResponseUtil;
+import com.sandu.ximon.admin.param.C3ChargingAddParam;
 import com.sandu.ximon.admin.param.C3ChargingParam;
 import com.sandu.ximon.admin.service.C3ChargingService;
 import lombok.AllArgsConstructor;
@@ -152,6 +153,42 @@
         return ResponseUtil.success(c3ChargingService.SetConstant(c3ChargingParam.getC3Mac(), c3ChargingParam.getConstant()));
     }
 
+    /**
+     * 璁剧疆鍦板潃
+     */
+    @PostMapping("/SetAddress")
+    public ResponseVO<Object> SetAddress(@RequestBody @Validated C3ChargingParam c3ChargingParam) {
+
+        return ResponseUtil.success(c3ChargingService.SetAddress(c3ChargingParam.getC3Mac(), c3ChargingParam.getAddress()));
+    }
+
+    /**
+     * 璁剧疆鏃ュ巻锛堝悓蹇冭烦鍖呬腑鐨�6瀛楄妭鏃ユ湡鏃堕棿锛�
+     */
+    @PostMapping("/SetCalendar")
+    public ResponseVO<Object> SetCalendar(@RequestBody @Validated C3ChargingParam c3ChargingParam) {
+
+        return ResponseUtil.success(c3ChargingService.SetCalendar(c3ChargingParam.getC3Mac()
+                , c3ChargingParam.getYear(), c3ChargingParam.getMonth(), c3ChargingParam.getDay(), c3ChargingParam.getHour(), c3ChargingParam.getMin(), c3ChargingParam.getSec()));
+    }
+
+    /**
+     * 鏁呴殰鐮佷笂鎶ユ竻闄�
+     */
+    @PostMapping("/ClearedFaultCode")
+    public ResponseVO<Object> ClearedFaultCode(@RequestBody @Validated C3ChargingParam c3ChargingParam) {
+
+        return ResponseUtil.success(c3ChargingService.ClearedFaultCode(c3ChargingParam.getC3Mac()));
+    }
+
+    /**
+     * 鎭㈠鍑哄巶鍊�
+     */
+    @PostMapping("/RestoreFactoryValue")
+    public ResponseVO<Object> RestoreFactoryValue(@RequestBody @Validated C3ChargingParam c3ChargingParam) {
+
+        return ResponseUtil.success(c3ChargingService.RestoreFactoryValue(c3ChargingParam.getC3Mac()));
+    }
 
     /**
      * 杞噸鍚�
@@ -166,4 +203,35 @@
             return ResponseUtil.fail(result);
         }
     }
+
+    /**
+     * 娣诲姞鍏呯數妗╃‖浠惰澶�
+     *
+     * @param c3ChargingAddParam
+     * @return
+     */
+    @PostMapping("/addC3Charging")
+    public ResponseVO<Object> addC3Charging(@RequestBody C3ChargingAddParam c3ChargingAddParam) {
+        boolean flag = c3ChargingService.addC3Charging(c3ChargingAddParam);
+        if (flag) {
+            return ResponseUtil.success("娣诲姞鍏呯數妗╃‖浠惰澶囨垚鍔燂紒");
+        } else {
+            return ResponseUtil.fail("娣诲姞鍏呯數妗╃‖浠惰澶囧け璐ワ紒");
+        }
+    }
+
+    /**
+     * 淇敼鍏呯數妗╃‖浠惰澶囧悕绉�
+     * @param c3ChargingAddParam
+     * @return
+     */
+    @PostMapping("/updateC3ChargingName")
+    public ResponseVO<Object> updateC3ChargingName(@RequestBody C3ChargingAddParam c3ChargingAddParam) {
+        boolean flag = c3ChargingService.updateC3ChargingName(c3ChargingAddParam);
+        if (flag) {
+            return ResponseUtil.success("淇敼鍏呯數妗╃‖浠惰澶囧悕绉版垚鍔燂紒");
+        } else {
+            return ResponseUtil.fail("淇敼鍏呯數妗╃‖浠惰澶囧悕绉板け璐ワ紒");
+        }
+    }
 }

--
Gitblit v1.9.3