From 7f72660c56e84b76db4781d02d10ae1c83c16f18 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 28 二月 2026 11:14:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpPointManagementController.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpPointManagementController.java
index 4630349..e189c27 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpPointManagementController.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpPointManagementController.java
@@ -85,9 +85,9 @@
      */
     @PostMapping("/addPoint")
     @ResponseBody
-    @Transactional
-    @ShardingSphereTransactionType(TransactionType.BASE)
     @ApiOperation(value = "新增点位")
+//    @Transactional
+//    @ShardingSphereTransactionType(TransactionType.BASE)
     public R add(@Validated  @RequestBody PointAddDto pointAddDto) {
         XpPoint xpPoint = new XpPoint();
         BeanUtils.copyProperties(pointAddDto, xpPoint);
@@ -100,8 +100,8 @@
     @GetMapping("/deletePoint")
     @ResponseBody
     @ApiOperation(value = "删除点位")
-    @Transactional
-    @ShardingSphereTransactionType(TransactionType.BASE)
+//    @Transactional
+//    @ShardingSphereTransactionType(TransactionType.BASE)
     public R deletePoint(@RequestParam("ids") String ids) {
         xpPointService.removeBatchByIds(Arrays.stream(ids.split(",")).map(Long::parseLong).collect(Collectors.toList()));
         return R.ok();
@@ -111,8 +111,8 @@
      */
     @PostMapping("/editPoint")
     @ApiOperation(value = "编辑点位")
-    @Transactional
-    @ShardingSphereTransactionType(TransactionType.BASE)
+//    @Transactional
+//    @ShardingSphereTransactionType(TransactionType.BASE)
     public R edit(@Validated@RequestBody PointUpdateDto pointAddDto) {
         XpPoint xpPoint = new XpPoint();
         BeanUtils.copyProperties(pointAddDto, xpPoint);
@@ -132,8 +132,8 @@
      */
     @PostMapping("/enableDisablePoint")
     @ApiOperation(value = "启用/禁用")
-    @Transactional
-    @ShardingSphereTransactionType(TransactionType.BASE)
+//    @Transactional
+//    @ShardingSphereTransactionType(TransactionType.BASE)
     public R enableDisable(@RequestBody XpPointEnableDisableDto dto) {
         XpPoint xpPoint = xpPointService.getById(dto.getId());
         xpPoint.setOperationStatus(dto.getOperationStatus());

--
Gitblit v1.7.1