From e2d42fa94683f14349a1a8b68c5cfbd3da938385 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期四, 17 十月 2024 17:00:56 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile --- ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/factory/SendMessageFallbackFactory.java | 20 ++++++-------------- 1 files changed, 6 insertions(+), 14 deletions(-) diff --git a/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/factory/SendMessageFallbackFactory.java b/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/factory/SendMessageFallbackFactory.java index c88ddbe..e063231 100644 --- a/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/factory/SendMessageFallbackFactory.java +++ b/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/factory/SendMessageFallbackFactory.java @@ -6,8 +6,7 @@ import com.ruoyi.integration.api.model.ChargingHandshake; import com.ruoyi.integration.api.model.PlatformStartCharging; import com.ruoyi.integration.api.model.PlatformStopCharging; -import io.seata.core.exception.TransactionException; -import io.seata.tm.api.GlobalTransactionContext; +import com.ruoyi.integration.api.model.QrCodeDelivery; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cloud.openfeign.FallbackFactory; @@ -31,25 +30,18 @@ @Override public String platformStartCharging(PlatformStartCharging platformStartCharging) { - // 手动进行全局事务回滚 - try { - GlobalTransactionContext.getCurrent().rollback(); - } catch (TransactionException e) { - throw new RuntimeException(e); - } return "远程启机失败"; } @Override public String platformStopCharging(PlatformStopCharging platformStopCharging) { - // 手动进行全局事务回滚 - try { - GlobalTransactionContext.getCurrent().rollback(); - } catch (TransactionException e) { - throw new RuntimeException(e); - } return "远程停机失败"; } + + @Override + public String qrCodeDelivery(QrCodeDelivery qrCodeDelivery) { + return "二维码下发失败"; + } }; } } -- Gitblit v1.7.1