From 0f4459e4201fdc19185b7dd03215871f036acd70 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 28 五月 2025 16:45:01 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into dev
---
ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/ChargingPileClient.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 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 c85317a..d22aa62 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
@@ -3,13 +3,12 @@
import com.ruoyi.chargingPile.api.factory.ChargingPileFallbackFactory;
import com.ruoyi.chargingPile.api.model.TChargingPile;
import com.ruoyi.chargingPile.api.vo.SiteInfoVO;
+import com.ruoyi.chargingPile.api.vo.UpdateChargingPileStatusVo;
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.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
import java.math.BigDecimal;
import java.util.List;
@@ -39,11 +38,20 @@
@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);
+
+
+ /**
+ * 修改充电桩状态
+ */
+ @PostMapping("/t-charging-pile/updateChargingPileStatus")
+ void updateChargingPileStatus(@RequestBody UpdateChargingPileStatusVo vo);
}
--
Gitblit v1.7.1