From 7cb8a6506062d0489dcd601a375f9dc89cbf6b4a Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 16 四月 2025 09:02:53 +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/SiteClient.java |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/SiteClient.java b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/SiteClient.java
index e8b235c..5581f7f 100644
--- a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/SiteClient.java
+++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/SiteClient.java
@@ -41,8 +41,10 @@
 	R<List<GetSiteListDTO>> getSiteListByUserId(@RequestParam("userId") Long userId);
 	@GetMapping("/partner/getPartnerR/{id}")
 	R<Partner> getPartnerR(@PathVariable("id") Integer id);
-	
-	
+	@GetMapping("/partner/getAllPartner")
+	public R<List<Partner>> getAllPartner();
+
+
 	/**
 	 * 分页查询站电数据
 	 * @param PageNo
@@ -50,5 +52,17 @@
 	 * @return
 	 */
 	@PostMapping("/site/getSiteListPaging")
-	PageInfo<Site> getSiteListPaging(@RequestParam("PageNo") Integer PageNo, @RequestParam("PageSize") Integer PageSize);
+	PageInfo<Site> getSiteListPaging(@RequestParam("PageNo") Integer PageNo,
+	                                 @RequestParam("PageSize") Integer PageSize,
+	                                 @RequestParam("ids") List<String> ids);
+	/**
+	 * 分页查询站电数据
+	 * @param PageNo
+	 * @param PageSize
+	 * @return
+	 */
+	@PostMapping("/site/getSiteListPagingJianGuan")
+	PageInfo<Site> getSiteListPagingJianGuan(@RequestParam("PageNo") Integer PageNo,
+	                                 @RequestParam("PageSize") Integer PageSize,
+	                                 @RequestParam("ids") List<String> ids);
 }

--
Gitblit v1.7.1