From 3c7311b3a6c4da836cbba8fe7997f5aec3e64c91 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 30 六月 2022 11:30:04 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3ChargingController.java | 93 ++++++++++++++++++++++++++++++++++++++--------
1 files changed, 77 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 d453ffd..f988623 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
@@ -2,9 +2,13 @@
import com.sandu.common.domain.ResponseVO;
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.*;
@@ -20,26 +24,36 @@
@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("/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);
+ @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.successPage(c3ChargingService.getC3ChargingListByKeyword(baseConditionVO, c3ChargingParam));
}
+
+ @AnonymousAccess
+ @GetMapping("/chargingInfo")
+ public ResponseVO<Object> getChargingInfo(@RequestParam(required = false, value = "poleId") String poleId) {
+ 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);
+// }
+//
+// }
/**
* 鍏呯數缁撴潫
@@ -68,6 +82,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);
+// }
+// }
/**
* 鏌ヨ鐗堟湰
@@ -202,4 +231,36 @@
return ResponseUtil.fail(result);
}
}
+
+ /**
+ * 娣诲姞鍏呯數妗╃‖浠惰澶�
+ *
+ * @param c3ChargingAddParam
+ * @return
+ */
+ @PostMapping("/addC3Charging")
+ public ResponseVO<Object> addC3Charging(@RequestBody C3ChargingAddParam c3ChargingAddParam) {
+ boolean flag = c3ChargingService.addC3Charging(c3ChargingAddParam);
+ if (flag) {
+ return ResponseUtil.success("娣诲姞鍏呯數妗╃‖浠惰澶囨垚鍔燂紒");
+ } else {
+ return ResponseUtil.fail("娣诲姞鍏呯數妗╃‖浠惰澶囧け璐ワ紒");
+ }
+ }
+
+ /**
+ * 淇敼鍏呯數妗╃‖浠惰澶囧悕绉�
+ *
+ * @param c3ChargingAddParam
+ * @return
+ */
+ @PostMapping("/updateC3ChargingName")
+ public ResponseVO<Object> updateC3ChargingName(@RequestBody C3ChargingAddParam c3ChargingAddParam) {
+ boolean flag = c3ChargingService.updateC3ChargingName(c3ChargingAddParam);
+ if (flag) {
+ return ResponseUtil.success("淇敼鍏呯數妗╃‖浠惰澶囧悕绉版垚鍔燂紒");
+ } else {
+ return ResponseUtil.fail("淇敼鍏呯數妗╃‖浠惰澶囧悕绉板け璐ワ紒");
+ }
+ }
}
--
Gitblit v1.9.3