From b48cbdf78fda3bbc66dc74162b08ec535c19d9ec Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 24 三月 2026 21:04:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/XpPointServiceImpl.java | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/XpPointServiceImpl.java b/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/XpPointServiceImpl.java
index bd09ebc..db42bc9 100644
--- a/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/XpPointServiceImpl.java
+++ b/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/XpPointServiceImpl.java
@@ -2,6 +2,8 @@
import cn.hutool.core.collection.CollUtil;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.xiaopeng.api.dto.operation.PointAddDto;
@@ -23,6 +25,7 @@
import com.xiaopeng.common.core.utils.StringUtils;
import com.xiaopeng.common.core.web.page.PageInfo;
import com.xiaopeng.common.redis.service.RedisService;
+import com.xiaopeng.evi.oss.service.AliOssService;
import com.xiaopeng.map.constant.I18nKeyConstant;
import com.xiaopeng.map.dto.NearestDto;
import com.xiaopeng.map.mapper.XpPointMapper;
@@ -49,6 +52,7 @@
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
+import java.io.UnsupportedEncodingException;
import java.time.LocalTime;
import java.util.*;
import java.util.concurrent.TimeUnit;
@@ -89,6 +93,9 @@
@Autowired
private RedissonClient redissonClient;
+
+ @Autowired
+ private AliOssService aliOssService;
@Override
@Transactional
@@ -294,6 +301,28 @@
@Override
public List<XpPoint> listAll(PointListQuery query) {
List<XpPoint> list = this.baseMapper.listAll(query);
+ for (XpPoint xpPoint : list) {
+ String pointPictures = xpPoint.getPointPictures();
+ if (org.apache.commons.lang3.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 = jsonObject.getString("url");;
+ try {
+ downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
+ } catch (UnsupportedEncodingException e) {
+ log.error("获取图片下载地址失败", e);
+ }
+ jsonObject.put("url", downloadUrl);
+ }
+ xpPoint.setPointPictures(JSONArray.toJSONString(jsonArray));
+ }
+
+ }
+
return list;
}
--
Gitblit v1.7.1