From a3aa8bd77b4a9a74601238cc467cfd115b0821b6 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 05 九月 2024 15:49:39 +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/AccountingStrategyDetailClient.java | 42 +++++++++++++++++++++++++++++++++++-------
1 files changed, 35 insertions(+), 7 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 cddb45e..94a055e 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
@@ -1,12 +1,16 @@
package com.ruoyi.chargingPile.api.feignClient;
+import com.ruoyi.chargingPile.api.dto.CheckChargingStrategyDTO;
import com.ruoyi.chargingPile.api.factory.AccountingStrategyDetailFallbackFactory;
import com.ruoyi.chargingPile.api.model.TAccountingStrategyDetail;
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.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
/**
* @author zhibing.pu
@@ -16,13 +20,7 @@
public interface AccountingStrategyDetailClient {
- /**
- * 获取当前有效的计费策略明细
- * @param accountingStrategyId
- * @return
- */
- @PostMapping("/t-accounting-strategy-detail/getNowData")
- R<TAccountingStrategyDetail> getNowData(@RequestParam("accountingStrategyId") Integer accountingStrategyId);
+
/**
* 通过站点id查询当前时段使用的策略明细
* @param siteId
@@ -30,4 +28,34 @@
*/
@PostMapping("/t-accounting-strategy-detail/getDetailBySiteId")
R<TAccountingStrategyDetail> getDetailBySiteId(@RequestParam("siteId") Integer siteId);
+ /**
+ * 通过桩编号查询当前时段使用的策略明细
+ * @param code
+ * @return
+ */
+ @PostMapping("/t-accounting-strategy-detail/getDetailByCode")
+ R<TAccountingStrategyDetail> getDetailByCode(@RequestParam("code") String code);
+ /**
+ * 校验充电桩计费模版是否准确
+ * @param
+ * @return
+ */
+ @PostMapping("/t-accounting-strategy-detail/checkChargingStrategy")
+ R<Boolean> checkChargingStrategy(@RequestBody CheckChargingStrategyDTO dto);
+
+
+ /**
+ * 根据计费策略主表id策略明细
+ * @param id
+ * @return
+ */
+ @PostMapping("/t-accounting-strategy-detail/getListByAccountingStrategyId")
+ R<List<TAccountingStrategyDetail>> getListByAccountingStrategyId(@RequestParam("id") Integer id);
+ /**
+ * 通过桩编号查询当前使用的策略明细列表
+ * @param code
+ * @return
+ */
+ @PostMapping("/t-accounting-strategy-detail/getDetailListByCode")
+ R<List<TAccountingStrategyDetail>> getDetailListByCode(@RequestParam("code") String code);
}
--
Gitblit v1.7.1