Merge remote-tracking branch 'origin/1.1' into 1.1

puzhibing

2025-02-05 9ce27f53094be15ee2e69c0dce31e3f324bfda99

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

@@ -2,13 +2,15 @@

import com.ruoyi.chargingPile.api.factory.ChargingGunFallbackFactory;
import com.ruoyi.chargingPile.api.model.TChargingGun;
import com.ruoyi.chargingPile.api.model.TFaultMessage;
import com.ruoyi.chargingPile.api.vo.GetChargingGunByCode;
import com.ruoyi.chargingPile.api.vo.SiteNameVO;
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.*;

import java.util.List;

/**
 * @author zhibing.pu
@@ -41,5 +43,47 @@
    */
   @PostMapping("/t-charging-gun/getAllInfoById/{id}")
   R<SiteNameVO> getAllInfoById(@PathVariable("id") Integer id);

   /**
    * 根据枪编号获取充电枪
    * @param code
    * @return
    */
   @PostMapping("/t-charging-gun/getChargingGunByCode")
   R<TChargingGun> getChargingGunByCode(@RequestBody GetChargingGunByCode code);
   /**
    * 编辑充电枪
    * @param chargingGun
    * @return
    */
   @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);
}