Merge remote-tracking branch 'origin/master'

puzhibing

2026-03-24 b48cbdf78fda3bbc66dc74162b08ec535c19d9ec

 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.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -32,19 +33,16 @@
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;

import javax.annotation.Resource;
import java.io.UnsupportedEncodingException;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
import java.util.List;
import java.util.*;
import java.util.stream.Collectors;

/**
@@ -73,8 +71,10 @@

    @Resource
    private IXpElectronicFenceService xpElectronicFenceService;
    @Autowired

    @Resource
    private AliOssService aliOssService;


    @Override
    public NearestVo nearest(NearestDto dto) {
@@ -218,6 +218,28 @@
    @Override
    public List<XpPoint> pointMap(PointMapQuery query) {
        List<XpPoint> list = this.baseMapper.pointMap(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;
    }

@@ -232,22 +254,31 @@
            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;
            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 {
                        // 1
                        downloadUrl= aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
                    } catch (Exception e) {
                        e.printStackTrace();
                        downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
                    } catch (UnsupportedEncodingException e) {
                        log.error("获取图片下载地址失败", e);
                    }
                    jsonObject.put("url", downloadUrl);
                    xpPoint.setPointPictures(jsonObject.toJSONString());
                }
                xpPoint.setPointPictures(JSONArray.toJSONString(jsonArray));
            }

        }



        return list;
    }