java/Robotaxi.git

			@@ -154,9 +154,9 @@
			@PostMapping("/add")
			@ResponseBody
			@ApiOperation(value = "新增点位")
			public R<XpPoint> add(@Validated @RequestBody PointAddDto pointAddDto) {
			if (!xpGeoFencingPolygonService.isInFence(pointAddDto.getPointLon(), pointAddDto.getPointLat(), pointAddDto.getFenceId(), "prohibited_area")) {
			return R.fail("in_prohibited_area");
			public R<?> add(@Validated @RequestBody PointAddDto pointAddDto) {
			if (xpGeoFencingPolygonService.isInFence(pointAddDto.getPointLon(), pointAddDto.getPointLat(), pointAddDto.getFenceId(), "prohibited_area")) {
			return R.ok("in_prohibited_area");
			}
			return R.ok(xpPointService.addPointWithGeneratedNumber(pointAddDto));
			}
			@@ -184,14 +184,14 @@
			if (!xpPoint.getElectronicAreaId().equals(pointAddDto.getElectronicAreaId())) {
			BeanUtils.copyProperties(pointAddDto, xpPoint);

			if (!xpGeoFencingPolygonService.isInFence(pointAddDto.getPointLon(), pointAddDto.getPointLat(), pointAddDto.getFenceId(), "prohibited_area")) {
			return R.fail("in_prohibited_area");
			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.fail("in_prohibited_area");
			if (xpGeoFencingPolygonService.isInFence(pointAddDto.getPointLon(), pointAddDto.getPointLat(), pointAddDto.getFenceId(), "prohibited_area")) {
			return R.ok("in_prohibited_area");
			}

			//先删除原有的数据，因为会存在点位的从属区域变化的情况，所以先删除原有的数据后添加新的数据重新分片到新的库中

	xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleCleanController.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpPointManagementController.java	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -110,6 +110,7 @@
			if(userIds.isEmpty()){
			return R.ok(page);
			}

			R<List<XpOperationsUser>> r = xpOperationUserClient.listByIds(userIds);
			if(r.getData().isEmpty()){
			return R.ok(page);