From c121143d54615f71d0b87a88ab09da7cfd16d9e4 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 31 八月 2022 16:14:57 +0800
Subject: [PATCH] 充电桩
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3ChargingController.java | 48 ++++++++++++++++++++++++++----------------------
1 files changed, 26 insertions(+), 22 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 9c4754f..0387ab6 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
@@ -29,11 +29,13 @@
@PostMapping("/C3ChargingList")
- public ResponseVO<Object> C3ChargingList(BaseConditionVO baseConditionVO, @RequestBody(required = false) C3ChargingParam c3ChargingParam) {
+ public ResponseVO<Object> C3ChargingList(BaseConditionVO baseConditionVO, @RequestBody(required = false) C3ChargingParam c3ChargingParam
+ , @RequestParam(value = "order", required = false) Integer order
+ , @RequestParam(value = "seq", required = false) Integer seq) {
if (!permissionConfig.check(MenuEnum.C3_CHARGING_LIST.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- return ResponseUtil.success(c3ChargingService.getC3ChargingListByKeyword(baseConditionVO, c3ChargingParam));
+ return ResponseUtil.success(c3ChargingService.getC3ChargingListByKeyword(baseConditionVO, c3ChargingParam, order, seq));
}
@AnonymousAccess
@@ -42,24 +44,25 @@
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
*/
+ @AnonymousAccess
@PostMapping("/finishCharging")
public ResponseVO<Object> finishCharging(@RequestBody C3ChargingParam c3ChargingParam) {
if (c3ChargingParam.getC3Mac() == null || c3ChargingParam.getOpenId() == null) {
@@ -79,7 +82,7 @@
*/
@PostMapping("/EndOfTheSynchronization")
public ResponseVO<Object> EndOfTheSynchronization(@RequestBody C3ChargingParam c3ChargingParam) {
- String result = c3ChargingService.EndOfTheSynchronization(c3ChargingParam.getC3Mac());
+ String result = c3ChargingService.EndOfTheSynchronization(c3ChargingParam.getC3Mac(), false);
if ("鎿嶄綔鎴愬姛".equals(result)) {
return ResponseUtil.success(result);
@@ -156,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.getC3Mac(), false));
}
/**
@@ -165,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.getC3Mac(), c3ChargingParam.getTime(), true, false));
}
/**
@@ -174,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.getC3Mac(), c3ChargingParam.getTime(), false, false));
}
/**
@@ -192,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.getC3Mac(), c3ChargingParam.getAddress(), false));
}
/**
@@ -202,7 +205,8 @@
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()));
+ , c3ChargingParam.getYear(), c3ChargingParam.getMonth(), c3ChargingParam.getDay()
+ , c3ChargingParam.getHour(), c3ChargingParam.getMin(), c3ChargingParam.getSec(), false));
}
/**
--
Gitblit v1.9.3