From 0bcfca6b2561d096a2ce26e2e7200cd0768b2b6d Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 12 五月 2026 09:27:03 +0800
Subject: [PATCH] Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.0
---
xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpPointManagementController.java | 128 ++++++++++++++++++++++++++++++++++++------
1 files changed, 110 insertions(+), 18 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 7838153..bfe73d4 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
@@ -1,30 +1,39 @@
package com.xiaopeng.map.controller;
+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;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import com.xiaopeng.api.dto.map.XpPointExportExcelQuery;
import com.xiaopeng.api.dto.operation.PointAddDto;
import com.xiaopeng.api.dto.operation.PointUpdateDto;
import com.xiaopeng.api.dto.operation.XpPointEnableDisableDto;
+import com.xiaopeng.api.feignClient.operation.XpCruisePlanClient;
import com.xiaopeng.api.model.operation.XpElectronicFence;
import com.xiaopeng.api.model.operation.XpElectronicFenceArea;
import com.xiaopeng.api.model.operation.XpPoint;
-import com.xiaopeng.api.feignClient.operation.XpCruisePlanClient;
import com.xiaopeng.api.query.operation.PointListQuery;
import com.xiaopeng.api.query.operation.PointPageListListQuery;
-import com.xiaopeng.map.constant.I18nKeyConstant;
import com.xiaopeng.common.core.domain.R;
import com.xiaopeng.common.core.exception.ServiceException;
import com.xiaopeng.common.core.utils.WebUtils;
import com.xiaopeng.common.core.web.controller.BaseController;
import com.xiaopeng.common.core.web.page.PageInfo;
-import com.xiaopeng.api.dto.map.XpPointExportExcelQuery;
+import com.xiaopeng.common.log.annotation.AdminOperationLog;
+import com.xiaopeng.common.log.enums.AdminBusinessType;
+import com.xiaopeng.common.log.enums.AdminOperationType;
+import com.xiaopeng.map.constant.I18nKeyConstant;
import com.xiaopeng.map.exportExcel.XpPointExportExcel;
import com.xiaopeng.map.mangodb.service.XpGeoFencingPolygonService;
import com.xiaopeng.map.service.XpElectronicFenceAreaService;
import com.xiaopeng.map.service.XpElectronicFenceService;
import com.xiaopeng.map.service.XpPointService;
-import cn.afterturn.easypoi.excel.ExcelExportUtil;
-import cn.afterturn.easypoi.excel.entity.ExportParams;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.usermodel.Workbook;
@@ -43,12 +52,7 @@
import java.nio.charset.StandardCharsets;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -75,10 +79,16 @@
@ApiOperation(value = "获取所有运营中的区域", response = XpElectronicFenceArea.class)
@PostMapping("/listElectronicFenceArea")
- public R<List<XpElectronicFenceArea>> listElectronicFenceArea() {
+ public R<List<XpElectronicFenceArea>> listElectronicFenceArea(@RequestParam(required = false) String cityCode) {
// 获取所有启用的电子围栏
- List<XpElectronicFence> electronicFences = xpElectronicFenceService.lambdaQuery()
- .eq(XpElectronicFence::getStatus, 2).list();
+
+ LambdaQueryWrapper<XpElectronicFence> queryWrapper= new LambdaQueryWrapper<>();
+ queryWrapper.eq(XpElectronicFence::getStatus, 2);
+ if(StrUtil.isNotBlank(cityCode)){
+ queryWrapper.eq(XpElectronicFence::getCityCode, cityCode);
+ }
+
+ List<XpElectronicFence> electronicFences = xpElectronicFenceService.list(queryWrapper);
List<Long> electronicFenceIds = electronicFences.stream().map(XpElectronicFence::getId).collect(Collectors.toList());
if (electronicFenceIds.isEmpty()) {
return R.ok(new ArrayList<XpElectronicFenceArea>());
@@ -111,6 +121,12 @@
@ApiOperation(value = "点位导出")
@PostMapping("/exportExcel")
+ @AdminOperationLog(
+ businessType = AdminBusinessType.POINT_MANAGEMENT,
+ operationType = AdminOperationType.EXPORT,
+ content = "导出正式点位",
+ appendRequestData = true
+ )
public void exportExcel(@RequestBody XpPointExportExcelQuery query) {
List<Long> pointIds = query == null ? Collections.emptyList() : query.getPointIds();
List<Long> distinctIds = pointIds == null
@@ -158,10 +174,17 @@
@PostMapping("/add")
@ResponseBody
@ApiOperation(value = "新增点位")
+ @AdminOperationLog(
+ businessType = AdminBusinessType.POINT_MANAGEMENT,
+ operationType = AdminOperationType.ADD,
+ content = "新增正式点位",
+ appendRequestData = true
+ )
public R<?> add(@Validated @RequestBody PointAddDto pointAddDto) {
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));
}
@@ -171,6 +194,12 @@
@GetMapping("/deletePoint")
@ResponseBody
@ApiOperation(value = "删除点位")
+ @AdminOperationLog(
+ businessType = AdminBusinessType.POINT_MANAGEMENT,
+ operationType = AdminOperationType.DELETE,
+ contentExpression = "'删除正式点位,ids=' + #p0",
+ appendRequestData = false
+ )
public R deletePoint(@RequestParam("ids") String ids) {
List<Long> pointIds = Arrays.stream(ids.split(","))
.map(String::trim)
@@ -197,14 +226,23 @@
*/
@PostMapping("/edit")
@ApiOperation(value = "编辑点位")
+ @AdminOperationLog(
+ businessType = AdminBusinessType.POINT_MANAGEMENT,
+ operationType = AdminOperationType.EDIT,
+ content = "编辑正式点位",
+ appendRequestData = true
+ )
@Transactional
@ShardingSphereTransactionType(TransactionType.BASE)
public R edit(@Validated @RequestBody PointUpdateDto pointAddDto) {
XpPoint xpPoint = xpPointService.getById(pointAddDto.getId());
- BeanUtils.copyProperties(pointAddDto, xpPoint);
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);
if (Integer.valueOf(2).equals(pointAddDto.getOperationStatus()) && Integer.valueOf(5).equals(pointAddDto.getVerificationStatus())) {
Long electronicAreaId = xpPoint.getElectronicAreaId();
if (electronicAreaId == null) {
@@ -227,17 +265,65 @@
throw new ServiceException("当前点位在禁行区内，不能启用。", I18nKeyConstant.POINT_ENABLE_IN_PROHIBITED_AREA);
}
}
- xpPointService.updateById(xpPoint);
+ xpPoint.setFpElectronicAreaId(null);
+
+ Integer stationSortNo = xpPoint.getStationSortNo(); //点位在场站内排序
+ Long stationId = pointAddDto.getStationId();
+ if(stationId != null && stationId > 0){
+ stationSortNo = 0;
+ }
+
+ // 使用 lambdaUpdate 确保 pointPictures 为 null 时也能将数据库字段清空
+ // （updateById 默认策略 NOT_NULL 会跳过 null 值，导致删除图片后数据库仍保留旧图片）
+ xpPointService.lambdaUpdate()
+ .eq(XpPoint::getId, xpPoint.getId())
+ .set(XpPoint::getPointName, xpPoint.getPointName())
+ .set(XpPoint::getPointPoi, xpPoint.getPointPoi())
+ .set(XpPoint::getPointNumber, xpPoint.getPointNumber())
+ .set(XpPoint::getOperationStatus, xpPoint.getOperationStatus())
+ .set(XpPoint::getPointType, xpPoint.getPointType())
+ .set(XpPoint::getVerificationStatus, xpPoint.getVerificationStatus())
+ .set(XpPoint::getParkingTimeLimit, xpPoint.getParkingTimeLimit())
+ .set(XpPoint::getOperationType, xpPoint.getOperationType())
+ .set(XpPoint::getEffectivePeriod, xpPoint.getEffectivePeriod())
+ .set(XpPoint::getEffectiveTimePeriod, xpPoint.getEffectiveTimePeriod())
+ .set(XpPoint::getPointAddress, xpPoint.getPointAddress())
+ .set(XpPoint::getRemarks, xpPoint.getRemarks())
+ .set(XpPoint::getPointPictures, xpPoint.getPointPictures())
+ .set(XpPoint::getPointLon, xpPoint.getPointLon())
+ .set(XpPoint::getPointLat, xpPoint.getPointLat())
+ .set(XpPoint::getElectronicAreaId, xpPoint.getElectronicAreaId())
+ .set(XpPoint::getChargePoint, xpPoint.getChargePoint())
+ .set(XpPoint::getParkingPoint, xpPoint.getParkingPoint())
+ .set(XpPoint::getProvinceName, xpPoint.getProvinceName())
+ .set(XpPoint::getProvinceCode, xpPoint.getProvinceCode())
+ .set(XpPoint::getCityCode, xpPoint.getCityCode())
+ .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();
+
+ //场站点位排序 后添加的点位 排第一个。
+ xpPointService.setStationSortNo(xpPoint.getStationId(),stationSortNo);
return R.ok();
}
/**
* 点位详情
*/
- @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());
}
/**
@@ -245,6 +331,12 @@
*/
@PostMapping("/enableDisable")
@ApiOperation(value = "启用/禁用")
+ @AdminOperationLog(
+ businessType = AdminBusinessType.POINT_MANAGEMENT,
+ operationType = AdminOperationType.SWITCH_STATUS,
+ content = "启用/禁用正式点位",
+ appendRequestData = true
+ )
public R enableDisable(@RequestBody XpPointEnableDisableDto dto) {
XpPoint xpPoint = xpPointService.getById(dto.getId());
xpPoint.setOperationStatus(dto.getOperationStatus());
--
Gitblit v1.7.1