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 | 44 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 39 insertions(+), 5 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 e2e5750..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,11 +1,15 @@
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;
import com.sandu.ximon.admin.param.C3ChargingAddParam;
import com.sandu.ximon.admin.param.C3ChargingParam;
+import com.sandu.ximon.admin.security.PermissionConfig;
import com.sandu.ximon.admin.service.C3ChargingService;
+import com.sandu.ximon.dao.enums.MenuEnum;
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -21,16 +25,27 @@
@RequestMapping("/v1/admin/C3Charging")
public class C3ChargingController {
private C3ChargingService c3ChargingService;
+ private PermissionConfig permissionConfig;
- @GetMapping("/C3ChargingList")
- public ResponseVO<Object> C3ChargingList(BaseConditionVO baseConditionVO) {
- return ResponseUtil.successPage(c3ChargingService.getC3ChargingList(baseConditionVO));
+ @PostMapping("/C3ChargingList")
+ public ResponseVO<Object> C3ChargingList(BaseConditionVO baseConditionVO, @RequestBody(required = false) C3ChargingParam c3ChargingParam) {
+ if (!permissionConfig.check(MenuEnum.C3_CHARGING_LIST.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ return ResponseUtil.success(c3ChargingService.getC3ChargingListByKeyword(baseConditionVO, c3ChargingParam));
+ }
+
+ @AnonymousAccess
+ @GetMapping("/chargingInfo")
+ public ResponseVO<Object> getChargingInfo(@RequestParam(required = false, value = "poleId") String poleId) {
+ 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());
@@ -43,11 +58,14 @@
}
/**
- * 鍏呯數缁撴潫
+ * 鍏呯數缁撴潫鈥斺�斿皬绋嬪簭鐢ㄦ埛缁撴潫锛屼笉闇�瑕乼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);
@@ -69,6 +87,21 @@
return ResponseUtil.fail(result);
}
}
+
+// /**
+// * 浜岀淮鐮�
+// */
+// @PostMapping("/QrCode")
+// public ResponseVO<Object> QrCode(@RequestBody C3ChargingParam c3ChargingParam) {
+// //String testUrl = "http://www.ximonsmart.com/charge/#/charge/" +streetlightId+"/"+System.currentTimeMillis();
+// String result = c3ChargingService.QrCode(c3ChargingParam.getC3Mac(), c3ChargingParam.getQrCodeData());
+//
+// if ("鎿嶄綔鎴愬姛".equals(result)) {
+// return ResponseUtil.success(result);
+// } else {
+// return ResponseUtil.fail(result);
+// }
+// }
/**
* 鏌ヨ鐗堟湰
@@ -222,6 +255,7 @@
/**
* 淇敼鍏呯數妗╃‖浠惰澶囧悕绉�
+ *
* @param c3ChargingAddParam
* @return
*/
--
Gitblit v1.9.3