From 6f028d74195393a2d060509f78ef00943e4f0305 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 24 十月 2024 16:16:57 +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 | 22 +++++++++++++++++++---
1 files changed, 19 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..c311954 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,14 @@
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 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 +16,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 +28,16 @@
*/
@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("/getPartnerR/{id}")
+ R<Partner> getPartnerR(@PathVariable("id") Integer id);
}
--
Gitblit v1.7.1