From 9ce27f53094be15ee2e69c0dce31e3f324bfda99 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 05 二月 2025 15:06:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.1' into 1.1
---
ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/ChargingGunClient.java | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 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 77548f2..bb7bc35 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
@@ -8,10 +8,9 @@
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;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
/**
* @author zhibing.pu
@@ -58,5 +57,33 @@
*/
@PostMapping("/t-charging-gun/updateChargingGunById")
R<String> updateChargingGunById(@RequestBody TChargingGun chargingGun);
-
+
+
+ /**
+ * 根据充电桩id获取枪
+ * @param chargingPileId
+ * @return
+ */
+ @PostMapping("/t-charging-gun/getChargingGunByChargingPileId")
+ R<List<TChargingGun>> getChargingGunByChargingPileId(@RequestParam("chargingPileId") Integer chargingPileId);
+
+
+ /**
+ * 根据充电桩ids获取枪
+ * @param chargingPileIds
+ * @return
+ */
+ @PostMapping("/t-charging-gun/getChargingGunByChargingPileIds")
+ R<List<TChargingGun>> getChargingGunByChargingPileIds(@RequestParam("chargingPileIds") List<Integer> chargingPileIds);
+
+
+
+ /**
+ * 接口状态变化后推送给第三方
+ * @param id
+ * @param status
+ * @return
+ */
+ @PostMapping("/t-charging-gun/pushChargingGunStatus")
+ R pushChargingGunStatus(@RequestParam("id") Integer id, @RequestParam("status") Integer status);
}
--
Gitblit v1.7.1