From 15eb7bf63cc857f77329f00798277514d8bb6ee0 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 20 三月 2026 11:56:57 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi

---
 xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehiclePreparationController.java |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehiclePreparationController.java b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehiclePreparationController.java
index 759e1e6..4d65ffe 100644
--- a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehiclePreparationController.java
+++ b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehiclePreparationController.java
@@ -15,6 +15,7 @@
 import com.xiaopeng.maintenance.service.XpTaskService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shardingsphere.transaction.annotation.ShardingSphereTransactionType;
 import org.apache.shardingsphere.transaction.core.TransactionType;
@@ -33,6 +34,7 @@
  * @author xiaochen
  * @since 2026-02-06
  */
+@Slf4j
 @Api(tags = "车辆整备")
 @RestController
 @RequestMapping("")
@@ -76,7 +78,12 @@
         if (StringUtils.isNotBlank(vehiclePictures)) {
             JSONObject jsonObject = JSONObject.parseObject(vehiclePictures);
             // 1
-            String downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
+                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);
             xpVehiclePreparationVO.setVehiclePictures(jsonObject.toJSONString());
         }

--
Gitblit v1.7.1