From 6f570591fb9155cf858981f432467ee9980762cd Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 24 八月 2022 15:36:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3ChargingController.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 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..f658334 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;
@@ -28,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.successPage(c3ChargingService.getC3ChargingListByKeyword(baseConditionVO, c3ChargingParam));
+ return ResponseUtil.success(c3ChargingService.getC3ChargingListByKeyword(baseConditionVO, c3ChargingParam, order, seq));
}
@AnonymousAccess
@@ -44,6 +47,7 @@
// /**
// * 鍏呯數寮�鍚�
// */
+// @AnonymousAccess
// @PostMapping("/startCharging")
// public ResponseVO<Object> startCharging(@RequestBody C3ChargingParam c3ChargingParam) {
// String result = c3ChargingService.startCharging(c3ChargingParam.getC3Mac(), c3ChargingParam.getChargingCapacity(), c3ChargingParam.getChargeAmount());
@@ -56,11 +60,15 @@
// }
/**
- * 鍏呯數缁撴潫
+ * 鍏呯數缁撴潫鈥斺�斿皬绋嬪簭鐢ㄦ埛缁撴潫锛屼笉闇�瑕乼oken锛岄渶瑕乷penId
*/
+ @AnonymousAccess
@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