From 7521ac93217c932523275a6d8472e13d677a5ca5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 24 三月 2026 18:24:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPointServiceImpl.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPointServiceImpl.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPointServiceImpl.java
index 88e2520..2735f3a 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPointServiceImpl.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPointServiceImpl.java
@@ -2,6 +2,7 @@
import cn.hutool.core.collection.CollUtil;
+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.PointMapQuery;
@@ -17,6 +18,7 @@
import com.xiaopeng.common.core.constant.CacheConstants;
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.operation.dto.NearestDto;
import com.xiaopeng.operation.mapper.XpPointMapper;
import com.xiaopeng.operation.mapper.XpSystemSettingMapper;
@@ -30,6 +32,7 @@
import com.xiaopeng.operation.vo.NearestNextVo;
import com.xiaopeng.operation.vo.NearestVo;
import com.xiaopeng.operation.vo.OrderDistanceVo;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
@@ -70,7 +73,8 @@
@Resource
private IXpElectronicFenceService xpElectronicFenceService;
-
+ @Autowired
+ private AliOssService aliOssService;
@Override
public NearestVo nearest(NearestDto dto) {
@@ -228,6 +232,22 @@
query.setOperationStatusIds(statusIds);
}
List<XpPoint> list = this.baseMapper.listAll(query);
+ for (XpPoint xpPoint : list) {
+ if (StringUtils.hasLength(xpPoint.getPointPictures())) {
+ JSONObject jsonObject = JSONObject.parseObject(xpPoint.getPointPictures());
+ if(jsonObject!=null){
+ String downloadUrl = null;
+ try {
+ // 1
+ downloadUrl= aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ jsonObject.put("url", downloadUrl);
+ xpPoint.setPointPictures(jsonObject.toJSONString());
+ }
+ }
+ }
return list;
}
--
Gitblit v1.7.1