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-map-boot/src/main/java/com/xiaopeng/map/controller/XpPointManagementController.java | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpPointManagementController.java b/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpPointManagementController.java
index 42f0251..5f32645 100644
--- a/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpPointManagementController.java
+++ b/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpPointManagementController.java
@@ -25,7 +25,10 @@
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.beans.BeanUtils;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -148,8 +151,6 @@
@PostMapping("/add")
@ResponseBody
@ApiOperation(value = "新增点位")
-// @Transactional
-// @ShardingSphereTransactionType(TransactionType.BASE)
public R<XpPoint> add(@Validated @RequestBody PointAddDto pointAddDto) {
return R.ok(xpPointService.addPointWithGeneratedNumber(pointAddDto));
}
@@ -160,8 +161,6 @@
@GetMapping("/deletePoint")
@ResponseBody
@ApiOperation(value = "删除点位")
-// @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();
@@ -172,8 +171,8 @@
*/
@PostMapping("/edit")
@ApiOperation(value = "编辑点位")
-// @Transactional
-// @ShardingSphereTransactionType(TransactionType.BASE)
+ @Transactional
+ @ShardingSphereTransactionType(TransactionType.BASE)
public R edit(@Validated @RequestBody PointUpdateDto pointAddDto) {
XpPoint xpPoint = xpPointService.getById(pointAddDto.getId());
if (!xpPoint.getElectronicAreaId().equals(pointAddDto.getElectronicAreaId())) {
@@ -203,8 +202,6 @@
*/
@PostMapping("/enableDisable")
@ApiOperation(value = "启用/禁用")
-// @Transactional
-// @ShardingSphereTransactionType(TransactionType.BASE)
public R enableDisable(@RequestBody XpPointEnableDisableDto dto) {
XpPoint xpPoint = xpPointService.getById(dto.getId());
xpPoint.setOperationStatus(dto.getOperationStatus());
--
Gitblit v1.7.1