From ab9cbec676c67cedf2590c5f0a90a458989f5c8f Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期六, 14 三月 2026 18:02:33 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi
---
xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpPointManagementController.java | 27 +++++++--------------------
1 files changed, 7 insertions(+), 20 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 2c0b940..c1416c7 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
@@ -186,7 +186,7 @@
throw new ServiceException("系统异常", I18nKeyConstant.SYSTEM_EXCEPTION);
}
if (Boolean.TRUE.equals(existsResult.getData())) {
- throw new ServiceException("操作失败，该点位有关联的巡游点位", I18nKeyConstant.POINT_DELETE_HAS_CRUISE_PLAN_POINT);
+ throw new ServiceException("操作失败，该点位有关联的巡游计划点位", I18nKeyConstant.POINT_DELETE_HAS_CRUISE_PLAN_POINT);
}
xpPointService.removeBatchByIds(pointIds);
return R.ok();
@@ -201,25 +201,12 @@
@ShardingSphereTransactionType(TransactionType.BASE)
public R edit(@Validated @RequestBody PointUpdateDto pointAddDto) {
XpPoint xpPoint = xpPointService.getById(pointAddDto.getId());
- if (!xpPoint.getElectronicAreaId().equals(pointAddDto.getElectronicAreaId())) {
- BeanUtils.copyProperties(pointAddDto, xpPoint);
-
- if (xpGeoFencingPolygonService.isInFence(pointAddDto.getPointLon(), pointAddDto.getPointLat(), pointAddDto.getFenceId(), "prohibited_area")) {
- return R.ok("in_prohibited_area");
- }
-
- xpPointService.updateById(xpPoint);
- } else {
- if (xpGeoFencingPolygonService.isInFence(pointAddDto.getPointLon(), pointAddDto.getPointLat(), pointAddDto.getFenceId(), "prohibited_area")) {
- return R.ok("in_prohibited_area");
- }
-
- //先删除原有的数据，因为会存在点位的从属区域变化的情况，所以先删除原有的数据后添加新的数据重新分片到新的库中
- BeanUtils.copyProperties(pointAddDto, xpPoint);
- xpPointService.removeById(pointAddDto.getId());
- xpPoint.setId(null);
- xpPointService.save(xpPoint);
+ BeanUtils.copyProperties(pointAddDto, xpPoint);
+ if (xpGeoFencingPolygonService.isInFence(pointAddDto.getPointLon(), pointAddDto.getPointLat(), pointAddDto.getFenceId(), "prohibited_area")) {
+ return R.ok("in_prohibited_area");
}
+
+ xpPointService.updateById(xpPoint);
return R.ok();
}
@@ -241,7 +228,7 @@
XpPoint xpPoint = xpPointService.getById(dto.getId());
xpPoint.setOperationStatus(dto.getOperationStatus());
xpPoint.setVerificationStatus(dto.getVerificationStatus());
- xpPoint.setElectronicAreaId(null);
+ xpPoint.setFpElectronicAreaId(null);
xpPointService.updateById(xpPoint);
return R.ok();
}
--
Gitblit v1.7.1