From ee2bf95f3472a4179ee0fc7c8e4e2a35e1214bc8 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期三, 23 十月 2024 10:15:08 +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/ChargingPileClient.java | 34 +++++++++++++++++++++++++++++++++- 1 files changed, 33 insertions(+), 1 deletions(-) diff --git a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/ChargingPileClient.java b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/ChargingPileClient.java index 7487856..9b19c6f 100644 --- a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/ChargingPileClient.java +++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/ChargingPileClient.java @@ -2,13 +2,17 @@ import com.ruoyi.chargingPile.api.factory.ChargingPileFallbackFactory; import com.ruoyi.chargingPile.api.model.TChargingPile; +import com.ruoyi.chargingPile.api.vo.SiteInfoVO; import com.ruoyi.common.core.constant.ServiceNameConstants; import com.ruoyi.common.core.domain.R; import io.swagger.annotations.ApiOperation; 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.RequestParam; +import java.math.BigDecimal; import java.util.List; /** @@ -23,7 +27,35 @@ */ @ApiOperation(value = "管理后台-通过站点id获取充电桩列表 不分页") @PostMapping(value = "/t-charging-pile/getChargingPileBySiteId") - public R<List<TChargingPile>> getChargingPileBySiteId(@RequestParam("siteId") Integer siteId); + R<List<TChargingPile>> getChargingPileBySiteId(@RequestParam("siteId") Integer siteId); + @ApiOperation(value = "获取站点列表") + @PostMapping(value = "/t-charging-pile/getChargingPileBySiteIds") + R<List<TChargingPile>> getChargingPileBySiteIds(@RequestParam("siteIds") List<Integer> siteIds); + /** + * 小程序远程调用 根据会员折扣、预付金额 计算服务费 + * @return + */ + @PostMapping(value = "/t-accounting-strategy/getServiceMoney") + R<BigDecimal> getServiceMoney(@RequestParam("param") String param); + + @GetMapping("/site/getSiteInfoByNumber") + R<SiteInfoVO> getSiteInfoByNumber(@RequestParam("number") String number); + + @PostMapping("/site/getSiteInfoByNumber1") + R<SiteInfoVO> getSiteInfoByNumber1(@RequestParam("number") String number); + + + @PostMapping("/t-charging-pile/getChargingPileById/{id}") + R<TChargingPile> getChargingPileById(@PathVariable("id") Integer id); + + + /** + * 修改充电桩状态 + * @param code + * @param status + */ + @PostMapping("/t-charging-pile/updateChargingPileStatus") + void updateChargingPileStatus(@RequestParam("code") String code, @RequestParam("status") Integer status); } -- Gitblit v1.7.1