From e19ab4b94932e47afb000d813640770c87074b58 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 29 六月 2022 15:20:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3ChargingController.java | 8 +++++---
1 files changed, 5 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 9fd0838..72b07c9 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.util.ResponseUtil;
import com.sandu.ximon.admin.param.C3ChargingAddParam;
@@ -34,9 +35,9 @@
return ResponseUtil.successPage(c3ChargingService.getC3ChargingListByKeyword(baseConditionVO, c3ChargingParam));
}
- @PostMapping("/getByC3Mac/{c3Mac}")
- public ResponseVO<Object> getByC3Mac(String c3Mac) {
- return ResponseUtil.success(c3ChargingService.getByC3Mac(c3Mac));
+ @GetMapping("/chargingInfo")
+ public ResponseVO<Object> getChargingInfo(@RequestParam(required = false, value = "poleId") String poleId) {
+ return ResponseUtil.success(c3ChargingService.getChargingInfo(poleId));
}
/**
@@ -248,6 +249,7 @@
/**
* 淇敼鍏呯數妗╃‖浠惰澶囧悕绉�
+ *
* @param c3ChargingAddParam
* @return
*/
--
Gitblit v1.9.3