From 9cc3a1b20c897fba88d36356200a77e87e0ee943 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 12 三月 2026 18:39:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpElectronicFenceController.java |   10 ++--------
 1 files changed, 2 insertions(+), 8 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 e92d0c3..1af5b19 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
@@ -84,8 +84,6 @@
      */
     @PostMapping("/add")
     @ApiOperation(value = "新增电子围栏")
-//    @Transactional
-//    @ShardingSphereTransactionType(TransactionType.BASE)
     public R add(@Validated @RequestBody ElectronicFenceAddDto dto) {
         return xpElectronicFenceService.addElectronic(dto);
     }
@@ -98,8 +96,6 @@
     @PostMapping("/updateStatus")
     @ResponseBody
     @ApiOperation(value = "修改状态")
-//    @Transactional
-//    @ShardingSphereTransactionType(TransactionType.BASE)
     public R updateStatus(@RequestBody ElectronicFenceAreaUpdateStatusDto dto) {
         XpElectronicFenceArea electronicFenceArea = xpElectronicFenceAreaService.getById(dto.getId());
         if (electronicFenceArea == null) {
@@ -138,8 +134,6 @@
      */
     @PostMapping("/edit1")
     @ApiOperation(value = "编辑电子围栏")
-//    @Transactional
-//    @ShardingSphereTransactionType(TransactionType.BASE)
     public R edit(@Validated @RequestBody ElectronicFenceUpdateDto dto) {
         return xpElectronicFenceService.editElectronic(dto);
     }
@@ -149,8 +143,8 @@
      */
     @PostMapping("/copy")
     @ApiOperation(value = "复制电子围栏")
-//    @Transactional
-//    @ShardingSphereTransactionType(TransactionType.BASE)
+    @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