From e1890b66e665c8860de00809f90ac57f5af651ba Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 19 三月 2026 15:43:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehiclePreparationController.java | 11 +++++------
1 files changed, 5 insertions(+), 6 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 5115a80..759e1e6 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
@@ -1,17 +1,15 @@
package com.xiaopeng.maintenance.controller;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson2.JSONObject;
-import com.xiaopeng.api.feignClient.account.XpOperationUserClient;
import com.xiaopeng.api.feignClient.vehicleConvoy.XpVehicleClient;
-import com.xiaopeng.evi.oss.service.AliOssService;
-import com.xiaopeng.maintenance.model.query.XpVehiclePreparationPageQuery;
import com.xiaopeng.api.vo.maintenance.XpVehiclePreparationDetailVO;
import com.xiaopeng.common.core.domain.R;
import com.xiaopeng.common.core.web.page.PageInfo;
import com.xiaopeng.common.security.service.TokenService;
+import com.xiaopeng.evi.oss.service.AliOssService;
import com.xiaopeng.maintenance.dto.XpVehiclePreparationDTO;
+import com.xiaopeng.maintenance.model.query.XpVehiclePreparationPageQuery;
import com.xiaopeng.maintenance.model.vo.XpVehiclePreparationVO;
import com.xiaopeng.maintenance.service.IXpVehiclePreparationService;
import com.xiaopeng.maintenance.service.XpTaskService;
@@ -26,7 +24,6 @@
import javax.validation.Valid;
import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
/**
* <p>
@@ -78,8 +75,10 @@
String vehiclePictures = xpVehiclePreparationVO.getVehiclePictures();
if (StringUtils.isNotBlank(vehiclePictures)) {
JSONObject jsonObject = JSONObject.parseObject(vehiclePictures);
+ // 1
String downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
- xpVehiclePreparationVO.setVehiclePictures(downloadUrl);
+ jsonObject.put("url", downloadUrl);
+ xpVehiclePreparationVO.setVehiclePictures(jsonObject.toJSONString());
}
--
Gitblit v1.7.1