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/factory/AccountingStrategyDetailFallbackFactory.java |   28 +++++++++++++++++++++++-----
 1 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/factory/AccountingStrategyDetailFallbackFactory.java b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/factory/AccountingStrategyDetailFallbackFactory.java
index 10f44fe..844dbb9 100644
--- a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/factory/AccountingStrategyDetailFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/factory/AccountingStrategyDetailFallbackFactory.java
@@ -1,5 +1,6 @@
 package com.ruoyi.chargingPile.api.factory;
 
+import com.ruoyi.chargingPile.api.dto.CheckChargingStrategyDTO;
 import com.ruoyi.chargingPile.api.feignClient.AccountingStrategyDetailClient;
 import com.ruoyi.chargingPile.api.model.TAccountingStrategyDetail;
 import com.ruoyi.common.core.domain.R;
@@ -7,6 +8,8 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
+
+import java.util.List;
 
 /**
  * @author zhibing.pu
@@ -21,16 +24,31 @@
 	public AccountingStrategyDetailClient create(Throwable throwable) {
 		log.error("计费策略调用失败:{}", throwable.getMessage());
 		return new AccountingStrategyDetailClient(){
-			
-			@Override
-			public R<TAccountingStrategyDetail> getNowData(Integer accountingStrategyId) {
-				return R.fail("获取当前有效的计费策略明细失败:" + throwable.getMessage());
-			}
 
 			@Override
 			public R<TAccountingStrategyDetail> getDetailBySiteId(Integer siteId) {
 				return R.fail("通过站点id查询当前时段使用的策略明细失败:" + throwable.getMessage());
 			}
+
+			@Override
+			public R<TAccountingStrategyDetail> getDetailByCode(String code) {
+				return R.fail("通过桩编号查询当前时段使用的策略明细失败:" + throwable.getMessage());
+			}
+
+			@Override
+			public R<Boolean> checkChargingStrategy(CheckChargingStrategyDTO dto) {
+				return R.fail("校验充电桩计费模版是否准确失败:" + throwable.getMessage());
+			}
+			
+			@Override
+			public R<List<TAccountingStrategyDetail>> getListByAccountingStrategyId(Integer id) {
+				throw new RuntimeException("根据计费策略主表id策略明细失败:" + throwable.getMessage());
+			}
+
+			@Override
+			public R<List<TAccountingStrategyDetail>> getDetailListByCode(String code) {
+				return R.fail("通过桩编号查询当前使用的策略明细列表失败:" + throwable.getMessage());
+			}
 		};
 	}
 }

--
Gitblit v1.7.1