From 423b61bfb18ceab430303bada28f93631f0e8392 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 12 八月 2022 16:05:17 +0800
Subject: [PATCH] 充电桩
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3ChargingController.java | 37 +++++++++++++++++++++----------------
1 files changed, 21 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 f988623..9c4754f 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
@@ -1,6 +1,7 @@
package com.sandu.ximon.admin.controller;
import com.sandu.common.domain.ResponseVO;
+import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.security.annotation.AnonymousAccess;
import com.sandu.common.util.ResponseUtil;
@@ -32,7 +33,7 @@
if (!permissionConfig.check(MenuEnum.C3_CHARGING_LIST.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- return ResponseUtil.successPage(c3ChargingService.getC3ChargingListByKeyword(baseConditionVO, c3ChargingParam));
+ return ResponseUtil.success(c3ChargingService.getC3ChargingListByKeyword(baseConditionVO, c3ChargingParam));
}
@AnonymousAccess
@@ -41,26 +42,30 @@
return ResponseUtil.success(c3ChargingService.getChargingInfo(poleId));
}
-// /**
-// * 鍏呯數寮�鍚�
-// */
-// @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
*/
@PostMapping("/finishCharging")
public ResponseVO<Object> finishCharging(@RequestBody C3ChargingParam c3ChargingParam) {
- String result = c3ChargingService.finishCharging(c3ChargingParam.getC3Mac());
+ if (c3ChargingParam.getC3Mac() == null || c3ChargingParam.getOpenId() == null) {
+ throw new BusinessException("鍙傛暟閿欒锛�");
+ }
+ String result = c3ChargingService.finishCharging(c3ChargingParam.getC3Mac(), c3ChargingParam.getOpenId());
if ("鎿嶄綔鎴愬姛".equals(result)) {
return ResponseUtil.success(result);
--
Gitblit v1.9.3