From 9da37c2c81926ac5c05e9aaf28036df1e858feee Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期六, 14 三月 2026 17:38:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpPointManagementController.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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 d6a06a9..f2d62aa 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
@@ -90,6 +90,7 @@
public R add(@Validated @RequestBody PointAddDto pointAddDto) {
XpPoint xpPoint = new XpPoint();
BeanUtils.copyProperties(pointAddDto, xpPoint);
+ xpPoint.setFpElectronicAreaId(xpPoint.getElectronicAreaId());
xpPointService.save(xpPoint);
return R.ok();
}
@@ -111,6 +112,7 @@
public R edit(@Validated@RequestBody PointUpdateDto pointAddDto) {
XpPoint xpPoint = new XpPoint();
BeanUtils.copyProperties(pointAddDto, xpPoint);
+ xpPoint.setFpElectronicAreaId(null);
xpPointService.updateById(xpPoint);
return R.ok();
}
@@ -130,7 +132,7 @@
public R enableDisable(@RequestBody XpPointEnableDisableDto dto) {
XpPoint xpPoint = xpPointService.getById(dto.getId());
xpPoint.setOperationStatus(dto.getOperationStatus());
- xpPoint.setElectronicAreaId(null);
+ xpPoint.setFpElectronicAreaId(null);
xpPointService.updateById(xpPoint);
return R.ok();
}
@@ -146,13 +148,13 @@
List<XpPoint> list = xpPointService.list(new LambdaQueryWrapper<XpPoint>().in(XpPoint::getId, dto.getChargePoints()));
list.forEach(e->{
e.setChargePoint(1);
- e.setElectronicAreaId(null);
+ e.setFpElectronicAreaId(null);
});
xpPointService.updateBatchById(list);
List<XpPoint> list1 = xpPointService.list(new LambdaQueryWrapper<XpPoint>().in(XpPoint::getId, dto.getParkingPoints()));
list1.forEach(e->{
e.setParkingPoint(1);
- e.setElectronicAreaId(null);
+ e.setFpElectronicAreaId(null);
});
xpPointService.updateBatchById(list1);
return R.ok();
--
Gitblit v1.7.1