From 73317bb411598db9e8cbc6561dd133ef116524cb Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 07 九月 2022 10:17:00 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3ChargingController.java | 89 ++++++++++++++++++++++----------------------
1 files changed, 45 insertions(+), 44 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 da3f27d..10e6ed2 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
@@ -65,10 +65,10 @@
@AnonymousAccess
@PostMapping("/finishCharging")
public ResponseVO<Object> finishCharging(@RequestBody C3ChargingParam c3ChargingParam) {
- if (c3ChargingParam.getC3Mac() == null || c3ChargingParam.getOpenId() == null) {
+ if (c3ChargingParam.getC3Id() == null || c3ChargingParam.getOpenId() == null) {
throw new BusinessException("鍙傛暟閿欒锛�");
}
- String result = c3ChargingService.finishCharging(c3ChargingParam.getC3Mac(), c3ChargingParam.getOpenId());
+ String result = c3ChargingService.finishCharging(c3ChargingParam.getC3Id(), c3ChargingParam.getOpenId());
if ("鎿嶄綔鎴愬姛".equals(result)) {
return ResponseUtil.success(result);
@@ -77,19 +77,19 @@
}
}
- /**
- * 鍚屾缁撴潫
- */
- @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("/EndOfTheSynchronization")
+// public ResponseVO<Object> EndOfTheSynchronization(@RequestBody C3ChargingParam c3ChargingParam) {
+// String result = c3ChargingService.EndOfTheSynchronization(c3ChargingParam.getC3Mac(), false);
+//
+// if ("鎿嶄綔鎴愬姛".equals(result)) {
+// return ResponseUtil.success(result);
+// } else {
+// return ResponseUtil.fail(result);
+// }
+// }
// /**
// * 浜岀淮鐮�
@@ -111,7 +111,7 @@
*/
@PostMapping("/QueryVersion")
public ResponseVO<Object> QueryVersion(@RequestBody C3ChargingParam c3ChargingParam) {
- String result = c3ChargingService.QueryVersion(c3ChargingParam.getC3Mac());
+ String result = c3ChargingService.QueryVersion(c3ChargingParam.getC3Id());
return ResponseUtil.success(result);
}
@@ -121,7 +121,7 @@
*/
@PostMapping("/QueryIntervalTime")
public ResponseVO<Object> QueryIntervalTime(@RequestBody C3ChargingParam c3ChargingParam) {
- String result = c3ChargingService.QueryIntervalTime(c3ChargingParam.getC3Mac());
+ String result = c3ChargingService.QueryIntervalTime(c3ChargingParam.getC3Id());
return ResponseUtil.success(result);
}
@@ -131,7 +131,7 @@
*/
@PostMapping("/QueryConstant")
public ResponseVO<Object> QueryConstant(@RequestBody C3ChargingParam c3ChargingParam) {
- String result = c3ChargingService.QueryConstant(c3ChargingParam.getC3Mac());
+ String result = c3ChargingService.QueryConstant(c3ChargingParam.getC3Id());
return ResponseUtil.success(result);
}
@@ -141,7 +141,7 @@
*/
@PostMapping("/QueryAddress")
public ResponseVO<Object> QueryAddress(@RequestBody C3ChargingParam c3ChargingParam) {
- String result = c3ChargingService.QueryAddress(c3ChargingParam.getC3Mac());
+ String result = c3ChargingService.QueryAddress(c3ChargingParam.getC3Id());
return ResponseUtil.success(result);
}
@@ -150,7 +150,7 @@
*/
@PostMapping("/QueryFaultCode")
public ResponseVO<Object> QueryFaultCode(@RequestBody C3ChargingParam c3ChargingParam) {
- String result = c3ChargingService.QueryFaultCode(c3ChargingParam.getC3Mac());
+ String result = c3ChargingService.QueryFaultCode(c3ChargingParam.getC3Id());
return ResponseUtil.success(result);
}
@@ -159,7 +159,7 @@
*/
@PostMapping("/ReadTheHeartbeatPackage")
public ResponseVO<Object> ReadTheHeartbeatPackage(@RequestBody C3ChargingParam c3ChargingParam) {
- return ResponseUtil.success(c3ChargingService.ReadTheHeartbeatPackage(c3ChargingParam.getC3Mac()));
+ return ResponseUtil.success(c3ChargingService.ReadTheHeartbeatPackage(c3ChargingParam.getC3Id(), false));
}
/**
@@ -168,7 +168,7 @@
@PostMapping("/SetHeartbeatPacketTimeCharging")
public ResponseVO<Object> SetHeartbeatPacketTimeCharging(@RequestBody @Validated C3ChargingParam c3ChargingParam) {
- return ResponseUtil.success(c3ChargingService.SetHeartbeatPacketTimeCharging(c3ChargingParam.getC3Mac(), c3ChargingParam.getTime(), true));
+ return ResponseUtil.success(c3ChargingService.SetHeartbeatPacketTimeCharging(c3ChargingParam.getC3Id(), c3ChargingParam.getTime(), true, false));
}
/**
@@ -177,7 +177,7 @@
@PostMapping("/SetHeartbeatPacketTimeNotCharging")
public ResponseVO<Object> SetHeartbeatPacketTimeNotCharging(@RequestBody @Validated C3ChargingParam c3ChargingParam) {
- return ResponseUtil.success(c3ChargingService.SetHeartbeatPacketTimeCharging(c3ChargingParam.getC3Mac(), c3ChargingParam.getTime(), false));
+ return ResponseUtil.success(c3ChargingService.SetHeartbeatPacketTimeCharging(c3ChargingParam.getC3Id(), c3ChargingParam.getTime(), false, false));
}
/**
@@ -186,7 +186,7 @@
@PostMapping("/SetConstant")
public ResponseVO<Object> SetConstant(@RequestBody @Validated C3ChargingParam c3ChargingParam) {
- return ResponseUtil.success(c3ChargingService.SetConstant(c3ChargingParam.getC3Mac(), c3ChargingParam.getConstant()));
+ return ResponseUtil.success(c3ChargingService.SetConstant(c3ChargingParam.getC3Id(), c3ChargingParam.getConstant()));
}
/**
@@ -195,7 +195,7 @@
@PostMapping("/SetAddress")
public ResponseVO<Object> SetAddress(@RequestBody @Validated C3ChargingParam c3ChargingParam) {
- return ResponseUtil.success(c3ChargingService.SetAddress(c3ChargingParam.getC3Mac(), c3ChargingParam.getAddress()));
+ return ResponseUtil.success(c3ChargingService.SetAddress(c3ChargingParam.getC3Id(), c3ChargingParam.getAddress(), false));
}
/**
@@ -204,8 +204,9 @@
@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()));
+ return ResponseUtil.success(c3ChargingService.SetCalendar(c3ChargingParam.getC3Id()
+ , c3ChargingParam.getYear(), c3ChargingParam.getMonth(), c3ChargingParam.getDay()
+ , c3ChargingParam.getHour(), c3ChargingParam.getMin(), c3ChargingParam.getSec(), false));
}
/**
@@ -214,7 +215,7 @@
@PostMapping("/ClearedFaultCode")
public ResponseVO<Object> ClearedFaultCode(@RequestBody @Validated C3ChargingParam c3ChargingParam) {
- return ResponseUtil.success(c3ChargingService.ClearedFaultCode(c3ChargingParam.getC3Mac()));
+ return ResponseUtil.success(c3ChargingService.ClearedFaultCode(c3ChargingParam.getC3Id()));
}
/**
@@ -223,7 +224,7 @@
@PostMapping("/RestoreFactoryValue")
public ResponseVO<Object> RestoreFactoryValue(@RequestBody @Validated C3ChargingParam c3ChargingParam) {
- return ResponseUtil.success(c3ChargingService.RestoreFactoryValue(c3ChargingParam.getC3Mac()));
+ return ResponseUtil.success(c3ChargingService.RestoreFactoryValue(c3ChargingParam.getC3Id()));
}
/**
@@ -231,7 +232,7 @@
*/
@PostMapping("/restartCharging")
public ResponseVO<Object> restartCharging(@RequestBody C3ChargingParam c3ChargingParam) {
- String result = c3ChargingService.restartCharging(c3ChargingParam.getC3Mac());
+ String result = c3ChargingService.restartCharging(c3ChargingParam.getC3Id());
if ("鎿嶄綔鎴愬姛".equals(result)) {
return ResponseUtil.success(result);
--
Gitblit v1.9.3