From e031959940a80792a60e2d8b83499cd168fa83d6 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 12 三月 2026 17:18:18 +0800
Subject: [PATCH] 修改事务注解

---
 xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpWhitelistController.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpWhitelistController.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpWhitelistController.java
index cc0f9ea..bedcc93 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpWhitelistController.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpWhitelistController.java
@@ -32,6 +32,8 @@
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.shardingsphere.transaction.annotation.ShardingSphereTransactionType;
+import org.apache.shardingsphere.transaction.core.TransactionType;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -104,7 +106,6 @@
     @PostMapping("/api/v1/whitelist/add")
     @ResponseBody
     @ApiOperation(value = "新增白名单")
-    @Transactional
     public R add(@Validated @RequestBody WhitelistAddDto dto) {
         if (!StringUtils.hasLength(dto.getAccount())) {
             return R.fail("请输入账号");
@@ -198,9 +199,12 @@
         }
     }
 
+
+
+    @Transactional
+    @ShardingSphereTransactionType(TransactionType.BASE)
     @Log(title = "白名单导入", businessType = BusinessType.IMPORT)
     @ApiOperation(value = "白名单导入")
-    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRES_NEW)
     @PostMapping("/base/v1/whitelist/importExcel")
     public AjaxResult<String> importExcel(@RequestParam("file") MultipartFile file) {
 

--
Gitblit v1.7.1