From fb9e286342938f63af535eb2a363f783a63213db Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 28 五月 2025 11:13:57 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into dev

---
 ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/ChargingGunClient.java |   40 +++++++++++++++++++++++++++++++++++++++-
 1 files changed, 39 insertions(+), 1 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 6370e8b..a1a1779 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,7 +2,7 @@
 
 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.model.TChargingPile;
 import com.ruoyi.chargingPile.api.vo.GetChargingGunByCode;
 import com.ruoyi.chargingPile.api.vo.SiteNameVO;
 import com.ruoyi.common.core.constant.ServiceNameConstants;
@@ -18,6 +18,18 @@
  */
 @FeignClient(contextId = "ChargingGunClient", value = ServiceNameConstants.CHARGINGPILE_SERVICE, fallbackFactory = ChargingGunFallbackFactory.class)
 public interface ChargingGunClient {
+	/**
+	 * 获取所有枪
+	 * @return
+	 */
+	@PostMapping("/t-charging-gun/getAllGun")
+	R<List<TChargingGun>> getAllGun();
+	/**
+	 * 获取所有桩
+	 * @return
+	 */
+	@PostMapping("/t-charging-gun/getAllPile")
+	R<List<TChargingPile>> getAllPile();
 	
 	/**
 	 * 根据id获取充电枪完整名称
@@ -35,6 +47,7 @@
 	 */
 	@PostMapping("/t-charging-gun/getChargingGunById/{id}")
 	R<TChargingGun> getChargingGunById(@PathVariable("id") Integer id);
+	
 
 	/**
 	 * 通过枪id获取站点、桩、枪的名称VO
@@ -69,6 +82,16 @@
 	
 	
 	/**
+	 * 根据充电桩ids获取枪
+	 * @param chargingPileIds
+	 * @return
+	 */
+	@PostMapping("/t-charging-gun/getChargingGunByChargingPileIds")
+	R<List<TChargingGun>> getChargingGunByChargingPileIds(@RequestParam("chargingPileIds") List<Integer> chargingPileIds);
+	
+	
+	
+	/**
 	 * 接口状态变化后推送给第三方
 	 * @param id
 	 * @param status
@@ -76,4 +99,19 @@
 	 */
 	@PostMapping("/t-charging-gun/pushChargingGunStatus")
 	R pushChargingGunStatus(@RequestParam("id") Integer id, @RequestParam("status") Integer status);
+
+
+
+	/**
+	 * 根据枪唯一码查询信息
+	 * @return
+	 */
+	@PostMapping("/t-charging-gun/getChargingGunByFullNumber")
+	R<TChargingGun> getChargingGunByFullNumber(@RequestParam("fullNumber") String fullNumber);
+
+	/**
+	 * 大屏 根据站点ids和充电模式集合查询充电枪集合
+	 */
+	@GetMapping("/t-charging-gun/getGunIdsBySiteIdsAndChargeModels")
+	R<List<Integer>> getGunIdsBySiteIdsAndChargeModels(@RequestParam("siteIds") List<Integer> siteIds ,@RequestParam("chargeModels") List<Integer> chargeModels);
 }

--
Gitblit v1.7.1