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/XpVehicleCleanController.java | 34 +++++++++++++++++++++++-----------
1 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleCleanController.java b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleCleanController.java
index 10bc2e3..5fb6f95 100644
--- a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleCleanController.java
+++ b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleCleanController.java
@@ -20,6 +20,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;
@@ -31,6 +32,7 @@
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
import java.util.stream.Collectors;
/**
@@ -41,6 +43,7 @@
* @author xiaochen
* @since 2026-02-06
*/
+@Slf4j
@Api(tags = "车辆清洁")
@RestController
@RequestMapping("")
@@ -89,7 +92,12 @@
if (vehiclePictures != null && !vehiclePictures.isEmpty()) {
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);
xpVehicleCleanVO.setVehiclePictures(jsonObject.toJSONString());
}
@@ -99,14 +107,16 @@
String taskImage = xpVehicleCleanVO.getTaskImage();
if (StringUtils.isNotBlank(taskImage)) {
JSONArray jsonArray = JSONArray.parseArray(taskImage);
- for (Object o : jsonArray) {
- JSONObject jsonObject = (JSONObject)o;
- String downloadUrl = null;
+ 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 (UnsupportedEncodingException e) {
- throw new RuntimeException(e);
+ log.error("获取图片下载地址失败", e);
}
jsonObject.put("url", downloadUrl);
}
@@ -160,14 +170,16 @@
String taskImage = record.getTaskImage();
if (StringUtils.isNotBlank(taskImage)) {
JSONArray jsonArray = JSONArray.parseArray(taskImage);
- for (Object o : jsonArray) {
- JSONObject jsonObject = (JSONObject)o;
- String downloadUrl = null;
+ 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 (UnsupportedEncodingException e) {
- throw new RuntimeException(e);
+ log.error("获取图片下载地址失败", e);
}
jsonObject.put("url", downloadUrl);
}
--
Gitblit v1.7.1