From d6c8f09fd628bd0111de4ee7071844465df9adb1 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 28 十月 2024 18:57:35 +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 | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 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..77548f2 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,11 +2,16 @@
import com.ruoyi.chargingPile.api.factory.ChargingGunFallbackFactory;
import com.ruoyi.chargingPile.api.model.TChargingGun;
+import com.ruoyi.chargingPile.api.model.TFaultMessage;
+import com.ruoyi.chargingPile.api.vo.GetChargingGunByCode;
+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;
+import org.springframework.web.bind.annotation.RequestBody;
/**
* @author zhibing.pu
@@ -20,8 +25,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 +34,29 @@
* @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);
+ /**
+ * 根据枪编号获取充电枪
+ * @param code
+ * @return
+ */
+ @PostMapping("/t-charging-gun/getChargingGunByCode")
+ R<TChargingGun> getChargingGunByCode(@RequestBody GetChargingGunByCode code);
+ /**
+ * 编辑充电枪
+ * @param chargingGun
+ * @return
+ */
+ @PostMapping("/t-charging-gun/updateChargingGunById")
+ R<String> updateChargingGunById(@RequestBody TChargingGun chargingGun);
+
}
--
Gitblit v1.7.1