From db79eca1d06cc0f3cfb5aae710262aedfb95577e Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 22 三月 2022 14:35:22 +0800
Subject: [PATCH] c3m退款实现
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3ChargingController.java | 68 ++++++++++++++++++++++++----------
1 files changed, 48 insertions(+), 20 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 a745dec..70c7c39 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
@@ -6,6 +6,7 @@
import com.sandu.ximon.admin.param.C3ChargingParam;
import com.sandu.ximon.admin.service.C3ChargingService;
import lombok.AllArgsConstructor;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
/**
@@ -75,11 +76,7 @@
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);
- }
+ return ResponseUtil.success(result);
}
/**
@@ -89,11 +86,7 @@
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);
- }
+ return ResponseUtil.success(result);
}
/**
@@ -103,11 +96,7 @@
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);
- }
+ return ResponseUtil.success(result);
}
/**
@@ -116,12 +105,51 @@
@PostMapping("/QueryAddress")
public ResponseVO<Object> QueryAddress(@RequestBody C3ChargingParam c3ChargingParam) {
String result = c3ChargingService.QueryAddress(c3ChargingParam.getC3Mac());
+ return ResponseUtil.success(result);
+ }
- if ("鎿嶄綔鎴愬姛".equals(result)) {
- return ResponseUtil.success(result);
- } else {
- return ResponseUtil.fail(result);
- }
+ /**
+ * 鏌ヨ鏁呴殰鐮�
+ */
+ @PostMapping("/QueryFaultCode")
+ public ResponseVO<Object> QueryFaultCode(@RequestBody C3ChargingParam c3ChargingParam) {
+ String result = c3ChargingService.QueryFaultCode(c3ChargingParam.getC3Mac());
+ return ResponseUtil.success(result);
+ }
+
+ /**
+ * 璇诲績璺冲寘
+ */
+ @PostMapping("/ReadTheHeartbeatPackage")
+ public ResponseVO<Object> ReadTheHeartbeatPackage(@RequestBody C3ChargingParam c3ChargingParam) {
+ return ResponseUtil.success(c3ChargingService.ReadTheHeartbeatPackage(c3ChargingParam.getC3Mac()));
+ }
+
+ /**
+ * 璁剧疆蹇冭烦鍖呴棿闅旀椂闂�(绉掞級-鍏呯數鐘舵�佹椂
+ */
+ @PostMapping("/SetHeartbeatPacketTimeCharging")
+ public ResponseVO<Object> SetHeartbeatPacketTimeCharging(@RequestBody @Validated C3ChargingParam c3ChargingParam) {
+
+ return ResponseUtil.success(c3ChargingService.SetHeartbeatPacketTimeCharging(c3ChargingParam.getC3Mac(), c3ChargingParam.getTime(), true));
+ }
+
+ /**
+ * 璁剧疆蹇冭烦鍖呴棿闅旀椂闂�(绉掞級-闈炲厖鐢电姸鎬佹椂
+ */
+ @PostMapping("/SetHeartbeatPacketTimeNotCharging")
+ public ResponseVO<Object> SetHeartbeatPacketTimeNotCharging(@RequestBody @Validated C3ChargingParam c3ChargingParam) {
+
+ return ResponseUtil.success(c3ChargingService.SetHeartbeatPacketTimeCharging(c3ChargingParam.getC3Mac(), c3ChargingParam.getTime(), false));
+ }
+
+ /**
+ * 璁剧疆鐢靛帇/鐢垫祦甯告暟(鍚勪竴瀛楄妭)(榛樿鍊�0xBC64)
+ */
+ @PostMapping("/SetConstant")
+ public ResponseVO<Object> SetConstant(@RequestBody @Validated C3ChargingParam c3ChargingParam) {
+
+ return ResponseUtil.success(c3ChargingService.SetConstant(c3ChargingParam.getC3Mac(), c3ChargingParam.getConstant()));
}
--
Gitblit v1.9.3