From 32291a03e69e7c3bdb627c893d52eebde0b140fe Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 29 十月 2024 14:20:36 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/AccountingStrategyDetailClient.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/AccountingStrategyDetailClient.java b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/AccountingStrategyDetailClient.java
index 1a11b6d..e12602d 100644
--- a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/AccountingStrategyDetailClient.java
+++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/feignClient/AccountingStrategyDetailClient.java
@@ -6,6 +6,7 @@
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;
@@ -20,26 +21,20 @@
public interface AccountingStrategyDetailClient {
- /**
- * 获取当前有效的计费策略明细
- * @param accountingStrategyId
- * @return
- */
- @PostMapping("/t-accounting-strategy-detail/getNowData")
- R<TAccountingStrategyDetail> getNowData(@RequestParam("accountingStrategyId") Integer accountingStrategyId);
+
/**
* 通过站点id查询当前时段使用的策略明细
* @param siteId
* @return
*/
- @PostMapping("/t-accounting-strategy-detail/getDetailBySiteId")
+ @GetMapping("/t-accounting-strategy-detail/getDetailBySiteId")
R<TAccountingStrategyDetail> getDetailBySiteId(@RequestParam("siteId") Integer siteId);
/**
* 通过桩编号查询当前时段使用的策略明细
* @param code
* @return
*/
- @PostMapping("/t-accounting-strategy-detail/getDetailByCode")
+ @GetMapping("/t-accounting-strategy-detail/getDetailByCode")
R<TAccountingStrategyDetail> getDetailByCode(@RequestParam("code") String code);
/**
* 校验充电桩计费模版是否准确
@@ -48,11 +43,20 @@
*/
@PostMapping("/t-accounting-strategy-detail/checkChargingStrategy")
R<Boolean> checkChargingStrategy(@RequestBody CheckChargingStrategyDTO dto);
+
+
+ /**
+ * 根据计费策略主表id策略明细
+ * @param id
+ * @return
+ */
+ @GetMapping("/t-accounting-strategy-detail/getListByAccountingStrategyId")
+ R<List<TAccountingStrategyDetail>> getListByAccountingStrategyId(@RequestParam("id") Integer id);
/**
* 通过桩编号查询当前使用的策略明细列表
* @param code
* @return
*/
- @PostMapping("/t-accounting-strategy-detail/getDetailListByCode")
+ @GetMapping("/t-accounting-strategy-detail/getDetailListByCode")
R<List<TAccountingStrategyDetail>> getDetailListByCode(@RequestParam("code") String code);
}
--
Gitblit v1.7.1