From 74dbde1f3b2f42c42a67ccd1df82f4d89c729559 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 11 十月 2025 17:40:31 +0800
Subject: [PATCH] Merge branch 'dev' 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/SiteFallbackFactory.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/factory/SiteFallbackFactory.java b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/factory/SiteFallbackFactory.java
index 71bdc99..daf0d37 100644
--- a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/factory/SiteFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/factory/SiteFallbackFactory.java
@@ -11,6 +11,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
@@ -46,7 +47,7 @@
 
             @Override
             public R<List<GetSiteListDTO>> getSiteListByUserId(Long userId) {
-                return null;
+                return R.fail("获取数据失败" + throwable.getMessage());
             }
 
             @Override
@@ -57,11 +58,16 @@
 
             @Override
             public R<List<Partner>> getAllPartner() {
+                return R.fail("获取数据失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public PageInfo<Site> getSiteListPaging(Integer PageNo, Integer PageSize, List<String> ids, Integer isOpenSynchronization) {
                 return null;
             }
 
             @Override
-            public PageInfo<Site> getSiteListPaging(Integer PageNo, Integer PageSize) {
+            public PageInfo<Site> getSiteListPagingJianGuan(Integer PageNo, Integer PageSize, List<String> ids) {
                 return null;
             }
         };

--
Gitblit v1.7.1