From dd295255a1156a9dc49688afb6b37eda58cd671f Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 26 九月 2024 20:16:38 +0800
Subject: [PATCH] 合併代碼
---
ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/factory/ChargingGunFallbackFactory.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/factory/ChargingGunFallbackFactory.java b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/factory/ChargingGunFallbackFactory.java
index f5a89cc..ad57df7 100644
--- a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/factory/ChargingGunFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/factory/ChargingGunFallbackFactory.java
@@ -4,8 +4,11 @@
import com.ruoyi.chargingPile.api.feignClient.ChargingPileClient;
import com.ruoyi.chargingPile.api.model.TChargingGun;
import com.ruoyi.chargingPile.api.model.TChargingPile;
+import com.ruoyi.chargingPile.api.model.TFaultMessage;
import com.ruoyi.chargingPile.api.vo.SiteNameVO;
import com.ruoyi.common.core.domain.R;
+import io.seata.core.exception.TransactionException;
+import io.seata.tm.api.GlobalTransactionContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory;
@@ -35,13 +38,30 @@
@Override
public R<TChargingGun> getChargingGunById(Integer id) {
- throw new RuntimeException("根据id获取充电枪失败：" + throwable.getMessage());
+ // 手动进行全局事务回滚
+ try {
+ GlobalTransactionContext.getCurrent().rollback();
+ } catch (TransactionException e) {
+ throw new RuntimeException(e);
+ }
+ return R.fail("根据id获取充电枪失败：" + throwable.getMessage());
}
@Override
public R<SiteNameVO> getAllInfoById(Integer id) {
return R.fail("通过枪id获取站点、桩、枪的名称失败：" + throwable.getMessage());
}
+
+ @Override
+ public R<TChargingGun> getChargingGunByCode(String code) {
+ return R.fail("根据枪编号获取充电枪失败：" + throwable.getMessage());
+ }
+
+ @Override
+ public R<String> updateChargingGunById(TChargingGun chargingGun) {
+ return R.fail("编辑充电枪失败：" + throwable.getMessage());
+ }
+
};
}
}
--
Gitblit v1.7.1