From b7cb5ffc4c21e69d846df29a5a641fcc8946a6e2 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 30 六月 2022 11:27:39 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3ChargingController.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 1ee8435..303d799 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,6 +2,7 @@
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;
@@ -34,9 +35,10 @@
return ResponseUtil.successPage(c3ChargingService.getC3ChargingListByKeyword(baseConditionVO, c3ChargingParam));
}
- @PostMapping("/getByC3Mac/{c3Mac}")
- public ResponseVO<Object> getByC3Mac(String c3Mac) {
- return ResponseUtil.success(c3ChargingService.getByC3Mac(c3Mac));
+ @AnonymousAccess
+ @GetMapping("/chargingInfo")
+ public ResponseVO<Object> getChargingInfo(@RequestParam(required = false, value = "poleId") String poleId) {
+ return ResponseUtil.success(c3ChargingService.getChargingInfo(poleId));
}
/**
@@ -86,6 +88,7 @@
*/
@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)) {
@@ -247,6 +250,7 @@
/**
* 淇敼鍏呯數妗╃‖浠惰澶囧悕绉�
+ *
* @param c3ChargingAddParam
* @return
*/
--
Gitblit v1.9.3