From fca00ddabb395a44c99b0a39b47a7cd2955aede0 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 18 十月 2024 10:51:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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..b30f0fe 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) {
+ return R.fail("远程更新硬件：" + throwable.getMessage());
+ }
};
}
}
--
Gitblit v1.7.1