From 560be817c1342d4da523760ba38433c4c0f52983 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 12 五月 2026 10:56:09 +0800
Subject: [PATCH] Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.1
---
xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpPointManagementController.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 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 ef12d9b..105e9b2 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
@@ -3,6 +3,7 @@
import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -168,6 +169,7 @@
if (xpGeoFencingPolygonService.isInFence(pointAddDto.getPointLon(), pointAddDto.getPointLat(), pointAddDto.getFenceId(), "prohibited_area")) {
return R.ok("in_prohibited_area");
}
+ xpPointService.validateAdd(pointAddDto);
return R.ok(xpPointService.addPointWithGeneratedNumber(pointAddDto));
}
@@ -210,6 +212,7 @@
if (xpPoint == null) {
throw new ServiceException("系统异常", I18nKeyConstant.SYSTEM_EXCEPTION);
}
+ xpPointService.validateUpdate(pointAddDto);
pointAddDto.setStationSortNo(xpPoint.getStationSortNo());
xpPointService.validatePointNameUnique(pointAddDto.getPointName(), pointAddDto.getId());
BeanUtils.copyProperties(pointAddDto, xpPoint);
@@ -271,6 +274,7 @@
.set(XpPoint::getCityName, xpPoint.getCityName())
.set(XpPoint::getDistrictName, xpPoint.getDistrictName())
.set(XpPoint::getDistrictCode, xpPoint.getDistrictCode())
+ .set(XpPoint::getPointOnOff, xpPoint.getPointOnOff())
.set(XpPoint::getStationId, stationId)
.set(XpPoint::getStationSortNo, stationSortNo)
.update();
@@ -283,10 +287,16 @@
/**
* 点位详情
*/
- @GetMapping("/api/v1/point/queryById")
+ @GetMapping("/queryById")
@ApiOperation(value = "点位详情")
public R<XpPoint> queryById(@RequestParam Long id) {
- return R.ok(xpPointService.getById(id));
+ PointListQuery query = new PointListQuery();
+ query.setId(id);
+ List<XpPoint> pointList = xpPointService.findList(query);
+ if(CollUtil.isNotEmpty(pointList)){
+ return R.ok(pointList.get(0));
+ }
+ return R.ok(new XpPoint());
}
/**
--
Gitblit v1.7.1