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-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/service/impl/XpPolicyApplicationServiceImpl.java |   27 +++++++++++++++++----------
 1 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/service/impl/XpPolicyApplicationServiceImpl.java b/xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/service/impl/XpPolicyApplicationServiceImpl.java
index b9e0565..81bbc37 100644
--- a/xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/service/impl/XpPolicyApplicationServiceImpl.java
+++ b/xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/service/impl/XpPolicyApplicationServiceImpl.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.bean.BeanUtil;
 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.core.metadata.IPage;
@@ -37,6 +38,7 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
+import java.io.UnsupportedEncodingException;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.util.*;
@@ -260,18 +262,23 @@
                 xpPolicyApplicationVO.setVehicleCode(xpVehicle.getVehicleCode());
                 xpPolicyApplicationVO.setAuditRemarks(xpPolicyApplication.getAuditRemarks());
                 if (xpPolicyApplicationVO.getAuditStatus() == 2 && StringUtils.isNotBlank(xpVehicle.getPolicyInformation())) {
-                    JSONObject jsonObject = JSONObject.parseObject(xpVehicle.getPolicyInformation());
-                    if(jsonObject!=null){
-                        String downloadUrl = null;
-                        try {
+                    JSONArray jsonArray = JSONArray.parseArray(xpVehicle.getPolicyInformation());
+                        for (int i = 0; i < jsonArray.size(); i++) {
+                            JSONObject jsonObject = jsonArray.getJSONObject(i);
+                            if (Objects.isNull(jsonObject)) {
+                                continue;
+                            }
                             // 1
-                            downloadUrl= aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
-                        } catch (Exception e) {
-                            e.printStackTrace();
+                            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);
                         }
-                        jsonObject.put("url", downloadUrl);
-                        xpPolicyApplicationVO.setPolicyInformation(jsonObject.toJSONString());
-                    }
+                    xpPolicyApplicationVO.setPolicyInformation(JSONArray.toJSONString(jsonArray));
+
                 }
             }
             queryPolicyInfoVO.setStatus(xpPolicyApplication.getAuditStatus());

--
Gitblit v1.7.1