Merge remote-tracking branch 'origin/master'

luodangjia

2024-09-10 ce19680b98669f8b4e66b2ce82fe0dcebe178445

 ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/SiteClient.java

@@ -2,14 +2,13 @@

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.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.*;

import java.util.List;

@@ -19,6 +18,8 @@
 */
@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集合获取数据
@@ -37,4 +38,6 @@

   @GetMapping("/site/getSiteList/byUserId")
   R<List<GetSiteListDTO>> getSiteListByUserId(@RequestParam("userId") Long userId);
   @GetMapping("/getPartnerR/{id}")
   R<Partner> getPartnerR(@PathVariable("id") Integer id);
}