From fa0926b8af58237ca80ae95da43d29188d20b0b8 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 29 六月 2022 15:49:17 +0800
Subject: [PATCH] 充电桩
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3ChargingController.java | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 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 e2e5750..9a6f840 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,14 @@
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.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,11 +24,20 @@
@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.successPage(c3ChargingService.getC3ChargingListByKeyword(baseConditionVO, c3ChargingParam));
+ }
+
+ @GetMapping("/chargingInfo")
+ public ResponseVO<Object> getChargingInfo(@RequestParam(required = false, value = "poleId") String poleId) {
+ return ResponseUtil.success(c3ChargingService.getChargingInfo(poleId));
}
/**
@@ -45,7 +57,7 @@
/**
* 鍏呯數缁撴潫
*/
- @PostMapping("/finishCharging")
+ @PostMapping("/finishCharging")
public ResponseVO<Object> finishCharging(@RequestBody C3ChargingParam c3ChargingParam) {
String result = c3ChargingService.finishCharging(c3ChargingParam.getC3Mac());
@@ -62,6 +74,21 @@
@PostMapping("/EndOfTheSynchronization")
public ResponseVO<Object> EndOfTheSynchronization(@RequestBody C3ChargingParam c3ChargingParam) {
String result = c3ChargingService.EndOfTheSynchronization(c3ChargingParam.getC3Mac());
+
+ if ("鎿嶄綔鎴愬姛".equals(result)) {
+ return ResponseUtil.success(result);
+ } else {
+ 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);
@@ -222,6 +249,7 @@
/**
* 淇敼鍏呯數妗╃‖浠惰澶囧悕绉�
+ *
* @param c3ChargingAddParam
* @return
*/
--
Gitblit v1.9.3