From 7ea47db47d3e039e25531cd511d8d7b1342ccfc0 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 23 十月 2024 20:04:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/ChargingPileClient.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 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 ff0b238..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
@@ -7,6 +7,7 @@
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;
@@ -28,6 +29,10 @@
@PostMapping(value = "/t-charging-pile/getChargingPileBySiteId")
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
@@ -35,11 +40,22 @@
@PostMapping(value = "/t-accounting-strategy/getServiceMoney")
R<BigDecimal> getServiceMoney(@RequestParam("param") String param);
- @PostMapping("/site/getSiteInfoByNumber")
- @ApiOperation(value = "扫一扫后通过桩编号获取电站信息", tags = {"小程序-扫一扫"})
+ @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