From c96fbe6b0aeb413a17c429133ee6d81d138144b9 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 09 六月 2026 10:58:52 +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 | 104 +++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 94 insertions(+), 10 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 e235e9b..e584038 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,14 +3,19 @@
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.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
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.feignClient.order.XpOrderClient;
import com.xiaopeng.api.model.operation.XpElectronicFence;
import com.xiaopeng.api.model.operation.XpElectronicFenceArea;
import com.xiaopeng.api.model.operation.XpPoint;
@@ -18,15 +23,21 @@
import com.xiaopeng.api.query.operation.PointPageListListQuery;
import com.xiaopeng.common.core.domain.R;
import com.xiaopeng.common.core.exception.ServiceException;
+import com.xiaopeng.common.core.utils.StringUtils;
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.evi.oss.service.AliOssService;
+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 com.xiaopeng.map.utils.GDMapGeocodingUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
@@ -35,6 +46,7 @@
import org.apache.shardingsphere.transaction.annotation.ShardingSphereTransactionType;
import org.apache.shardingsphere.transaction.core.TransactionType;
import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -43,6 +55,7 @@
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
+import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.time.LocalDateTime;
@@ -50,6 +63,9 @@
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
+import com.xiaopeng.common.log.annotation.AdminOperationLog;
+import com.xiaopeng.common.log.enums.AdminBusinessType;
+import com.xiaopeng.common.log.enums.AdminOperationType;
@Slf4j
@@ -70,6 +86,12 @@
private XpGeoFencingPolygonService xpGeoFencingPolygonService;
@Resource
private XpCruisePlanClient xpCruisePlanClient;
+ @Resource
+ private XpOrderClient xpOrderClient;
+ @Autowired
+ private AliOssService aliOssService;
+ @Resource
+ private GDMapGeocodingUtil gdMapGeocodingUtil;
@ApiOperation(value = "获取所有运营中的区域", response = XpElectronicFenceArea.class)
@@ -77,13 +99,13 @@
public R<List<XpElectronicFenceArea>> listElectronicFenceArea(@RequestParam(required = false) String cityCode) {
// 获取所有启用的电子围栏
- LambdaQueryChainWrapper<XpElectronicFence> eq = xpElectronicFenceService.lambdaQuery()
- .eq(XpElectronicFence::getStatus, 2);
+ LambdaQueryWrapper<XpElectronicFence> queryWrapper= new LambdaQueryWrapper<>();
+ queryWrapper.eq(XpElectronicFence::getStatus, 2);
if(StrUtil.isNotBlank(cityCode)){
- eq.eq(XpElectronicFence::getCityCode, cityCode);
+ queryWrapper.eq(XpElectronicFence::getCityCode, cityCode);
}
- List<XpElectronicFence> electronicFences = xpElectronicFenceService.list(eq);
+ 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>());
@@ -116,6 +138,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
@@ -163,10 +191,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));
}
@@ -176,6 +211,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)
@@ -202,6 +243,12 @@
*/
@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) {
@@ -209,6 +256,8 @@
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())) {
@@ -233,14 +282,18 @@
throw new ServiceException("当前点位在禁行区内，不能启用。", I18nKeyConstant.POINT_ENABLE_IN_PROHIBITED_AREA);
}
}
+ Map<String, String> geocode = gdMapGeocodingUtil.geocode(xpPoint.getPointLon().toString(), xpPoint.getPointLat().toString());
+ if(null == geocode){
+ throw new ServiceException("点位定位解析失败");
+ }
+ xpPoint.setCityCode(geocode.get("cityCode"));
+ xpPoint.setCityName(geocode.get("address"));
xpPoint.setFpElectronicAreaId(null);
+ Integer stationSortNo = xpPoint.getStationSortNo(); //点位在场站内排序
Long stationId = pointAddDto.getStationId();
- Integer stationSortNo = pointAddDto.getStationSortNo(); //点位在场站内排序
if(stationId != null && stationId > 0){
- if(stationSortNo == null){
- stationSortNo = 0;
- }
+ stationSortNo = 0;
}
// 使用 lambdaUpdate 确保 pointPictures 为 null 时也能将数据库字段清空
@@ -271,6 +324,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 +337,31 @@
/**
* 点位详情
*/
- @GetMapping("/api/v1/point/queryById")
+ @GetMapping("/queryById")
@ApiOperation(value = "点位详情")
public R<XpPoint> queryById(@RequestParam Long id) {
- return R.ok(xpPointService.getById(id));
+ XpPoint xpPoint = xpPointService.getById(id);
+ String pointPictures = xpPoint.getPointPictures();
+ if (StringUtils.isNotBlank(pointPictures)) {
+ JSONArray jsonArray = JSONArray.parseArray(pointPictures);
+ for (int i = 0; i < jsonArray.size(); i++) {
+ JSONObject jsonObject = jsonArray.getJSONObject(i);
+ if (Objects.isNull(jsonObject)) {
+ continue;
+ }
+ String downloadUrl ="";
+ try {
+ downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
+ log.info("downloadUrl:{}", downloadUrl);
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ log.error("获取图片下载地址失败", e);
+ }
+ jsonObject.put("url", downloadUrl);
+ }
+ xpPoint.setPointPictures(jsonArray.toJSONString());
+ }
+ return R.ok(xpPoint);
}
/**
@@ -294,6 +369,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());
@@ -355,4 +436,7 @@
return null;
}
+
+
+
}
--
Gitblit v1.7.1