From 85c4410b0948799a93f19f345b4ed18c253c89f3 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 03 九月 2024 10:26:33 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/ChargingGunClient.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/ChargingGunClient.java b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/ChargingGunClient.java
index 015c04b..1e9cf96 100644
--- a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/ChargingGunClient.java
+++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/ChargingGunClient.java
@@ -2,10 +2,12 @@
import com.ruoyi.chargingPile.api.factory.ChargingGunFallbackFactory;
import com.ruoyi.chargingPile.api.model.TChargingGun;
+import com.ruoyi.chargingPile.api.vo.SiteNameVO;
import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
/**
@@ -20,8 +22,8 @@
* @param id
* @return
*/
- @PostMapping("/t-charging-gun/getAllName")
- R<String> getAllName(Integer id);
+ @PostMapping("/t-charging-gun/getAllName/{id}")
+ R<String> getAllName(@PathVariable("id") Integer id);
/**
@@ -29,6 +31,15 @@
* @param id
* @return
*/
- @PostMapping("/t-charging-gun/getChargingGunById")
- R<TChargingGun> getChargingGunById(Integer id);
+ @PostMapping("/t-charging-gun/getChargingGunById/{id}")
+ R<TChargingGun> getChargingGunById(@PathVariable("id") Integer id);
+
+ /**
+ * 通过枪id获取站点、桩、枪的名称VO
+ * @param id
+ * @return
+ */
+ @PostMapping("/t-charging-gun/getAllInfoById/{id}")
+ R<SiteNameVO> getAllInfoById(@PathVariable("id") Integer id);
+
}
--
Gitblit v1.7.1