From 3896cbb9ed6fa03d90a4032238dad7b2f39c607c Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期二, 24 三月 2026 20:23:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleRepairController.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleRepairController.java b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleRepairController.java
index 537511e..9d1c6a2 100644
--- a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleRepairController.java
+++ b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleRepairController.java
@@ -101,7 +101,7 @@
if (StringUtils.isNotBlank(vehiclePictures)) {
JSONObject jsonObject = JSONObject.parseObject(vehiclePictures);
// 1
- String downloadUrl = jsonObject.getString("url");;
+ String downloadUrl = jsonObject.getString("url");
try {
downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
} catch (UnsupportedEncodingException e) {
@@ -120,7 +120,7 @@
continue;
}
// 1
- String downloadUrl = jsonObject.getString("url");;
+ String downloadUrl = jsonObject.getString("url");
try {
downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
} catch (UnsupportedEncodingException e) {
@@ -130,7 +130,20 @@
}
xpVehicleRepairVO.setStartRepairPicture(JSONArray.toJSONString(jsonArray));
}
-
+ String repairMoneyDetail = xpVehicleRepairVO.getRepairMoneyDetail();
+ if (StringUtils.isNotBlank(repairMoneyDetail)) {
+ JSONObject jsonObject = JSONObject.parseObject(repairMoneyDetail);
+ if(jsonObject!=null){
+ String downloadUrl = null;
+ try {
+ downloadUrl= aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ jsonObject.put("url", downloadUrl);
+ xpVehicleRepairVO.setRepairMoneyDetail(jsonObject.toJSONString());
+ }
+ }
return R.ok(xpVehicleRepairVO);
}
--
Gitblit v1.7.1