From 6406a54f7d2b67b46eae0e7987900974b34be5d7 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 24 六月 2025 21:03:10 +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-integration/src/main/java/com/ruoyi/integration/api/factory/IntegrationFallbackFactory.java |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/factory/IntegrationFallbackFactory.java b/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/factory/IntegrationFallbackFactory.java
index 195a34c..3424e16 100644
--- a/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/factory/IntegrationFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/factory/IntegrationFallbackFactory.java
@@ -48,10 +48,10 @@
                 return R.fail("读取实时监测数据调用失败:" + throwable.getMessage());
             }
 
-            @Override
-            public R<String> endCharge(EndCharge endCharge) {
-                return R.fail("充电结束调用失败:" + throwable.getMessage());
-            }
+//            @Override
+//            public R<String> endCharge(EndCharge endCharge) {
+//                return R.fail("充电结束调用失败:" + throwable.getMessage());
+//            }
 
             @Override
             public R<String> platformConfirmationCharging(PlatformConfirmationCharging platformConfirmationCharging) {
@@ -122,6 +122,11 @@
             public R<String> platformRemoteUpdate(PlatformRemoteUpdate platformRemoteUpdate) {
                 return R.fail("远程更新调用失败:" + throwable.getMessage());
             }
+
+            @Override
+            public R<String> setupBillingModel1(String deviceId, String json) {
+                return R.fail("远程更新硬件:" + throwable.getMessage());
+            }
         };
     }
 }

--
Gitblit v1.7.1