From 53e51ca607340232911bfa277d1ce7d641fb34bc Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期六, 28 二月 2026 11:40:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpElectronicFenceController.java | 16 ++++++++--------
1 files changed, 8 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 e7322c7..1a6c63a 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,8 @@
*/
@PostMapping("/add")
@ApiOperation(value = "新增电子围栏")
- @Transactional
- @ShardingSphereTransactionType(TransactionType.BASE)
+// @Transactional
+// @ShardingSphereTransactionType(TransactionType.BASE)
public R add(@Validated @RequestBody ElectronicFenceAddDto dto) {
return xpElectronicFenceService.addElectronic(dto);
}
@@ -98,8 +98,8 @@
@PostMapping("/updateStatus")
@ResponseBody
@ApiOperation(value = "修改状态")
- @Transactional
- @ShardingSphereTransactionType(TransactionType.BASE)
+// @Transactional
+// @ShardingSphereTransactionType(TransactionType.BASE)
public R updateStatus(@RequestBody ElectronicFenceAreaUpdateStatusDto dto) {
XpElectronicFenceArea electronicFenceArea = xpElectronicFenceAreaService.getById(dto.getId());
if (electronicFenceArea == null) {
@@ -138,8 +138,8 @@
*/
@PostMapping("/edit")
@ApiOperation(value = "编辑电子围栏")
- @Transactional
- @ShardingSphereTransactionType(TransactionType.BASE)
+// @Transactional
+// @ShardingSphereTransactionType(TransactionType.BASE)
public R edit(@Validated @RequestBody ElectronicFenceUpdateDto dto) {
return xpElectronicFenceService.editElectronic(dto);
}
@@ -149,8 +149,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