From 523f7ddf88485eb611f8f8130e35e2bd88d5b386 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 26 二月 2026 14:27:55 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi

---
 xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpElectronicFenceController.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpElectronicFenceController.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpElectronicFenceController.java
index 956b752..d20a2cd 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpElectronicFenceController.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpElectronicFenceController.java
@@ -20,6 +20,8 @@
 import com.xiaopeng.operation.service.XpRegionService;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.shardingsphere.transaction.annotation.ShardingSphereTransactionType;
+import org.apache.shardingsphere.transaction.core.TransactionType;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -83,6 +85,7 @@
     @PostMapping("/add")
     @ApiOperation(value = "新增电子围栏")
     @Transactional
+    @ShardingSphereTransactionType(TransactionType.BASE)
     public R add(@Validated @RequestBody ElectronicFenceAddDto dto) {
         return xpElectronicFenceService.addElectronic(dto);
     }
@@ -95,6 +98,8 @@
     @PostMapping("/updateStatus")
     @ResponseBody
     @ApiOperation(value = "修改状态")
+    @Transactional
+    @ShardingSphereTransactionType(TransactionType.BASE)
     public R updateStatus(@RequestBody ElectronicFenceAreaUpdateStatusDto dto) {
         XpElectronicFenceArea electronicFenceArea = xpElectronicFenceAreaService.getById(dto.getId());
         if (electronicFenceArea == null) {
@@ -134,6 +139,7 @@
     @PostMapping("/edit")
     @ApiOperation(value = "编辑电子围栏")
     @Transactional
+    @ShardingSphereTransactionType(TransactionType.BASE)
     public R edit(@Validated @RequestBody ElectronicFenceUpdateDto dto) {
         return xpElectronicFenceService.editElectronic(dto);
     }
@@ -144,6 +150,7 @@
     @PostMapping("/copy")
     @ApiOperation(value = "复制电子围栏")
     @Transactional
+    @ShardingSphereTransactionType(TransactionType.BASE)
     public R<Long> copy(@RequestParam("id") Integer id) {
         XpElectronicFence electronicFence = xpElectronicFenceService.getById(id);
         if (electronicFence.getStatus()==2){

--
Gitblit v1.7.1