From 0f4459e4201fdc19185b7dd03215871f036acd70 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 28 五月 2025 16:45:01 +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/SiteClient.java | 49 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 46 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 92fb25a..30bc547 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
@@ -1,12 +1,15 @@
package com.ruoyi.chargingPile.api.feignClient;
+import com.ruoyi.chargingPile.api.dto.GetSiteListDTO;
import com.ruoyi.chargingPile.api.factory.SiteFallbackFactory;
+import com.ruoyi.chargingPile.api.model.Partner;
import com.ruoyi.chargingPile.api.model.Site;
+import com.ruoyi.chargingPile.api.model.TChargingPile;
import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.web.page.PageInfo;
import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -14,8 +17,10 @@
* @author zhibing.pu
* @Date 2024/8/10 14:38
*/
-@FeignClient(contextId = "SiteClient", value = ServiceNameConstants.CONTRACT_SERVICE, fallbackFactory = SiteFallbackFactory.class)
+@FeignClient(contextId = "SiteClient", value = ServiceNameConstants.CHARGINGPILE_SERVICE, fallbackFactory = SiteFallbackFactory.class)
public interface SiteClient {
+ @GetMapping("/site/getPileListBySiteId/{siteId}")
+ public R<List<TChargingPile>> getPileListBySiteId(@PathVariable("siteId")Integer siteId);
/**
* 根据id集合获取数据
@@ -24,4 +29,42 @@
*/
@PostMapping("/site/getSiteByIds")
R<List<Site>> getSiteByIds(@RequestBody List<Integer> ids);
+
+ /**
+ * 获取所有站点
+ * @return
+ */
+ @PostMapping("/site/getSiteAll")
+ R<List<Site>> getSiteAll();
+
+ @GetMapping("/site/getSiteList/byUserId")
+ 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
+ * @param PageSize
+ * @return
+ */
+ @PostMapping("/site/getSiteListPaging")
+ 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