From 694962918618b6d9531d8ca876a6746e030387f1 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 23 八月 2022 11:38:26 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3ChargingController.java | 35 +++++++++++++++++++----------------
1 files changed, 19 insertions(+), 16 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 998335c..da3f27d 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) {
--
Gitblit v1.9.3