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/XpVehicleCleanController.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 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 9e80b0a..10bc2e3 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
@@ -1,7 +1,7 @@
package com.xiaopeng.maintenance.controller;
-import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.xiaopeng.api.feignClient.account.XpOperationUserClient;
@@ -88,8 +88,10 @@
String vehiclePictures = xpVehicleCleanVO.getVehiclePictures();
if (vehiclePictures != null && !vehiclePictures.isEmpty()) {
JSONObject jsonObject = JSONObject.parseObject(vehiclePictures);
+ // 1
String downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
- xpVehicleCleanVO.setVehiclePictures(downloadUrl);
+ jsonObject.put("url", downloadUrl);
+ xpVehicleCleanVO.setVehiclePictures(jsonObject.toJSONString());
}
@@ -97,18 +99,18 @@
String taskImage = xpVehicleCleanVO.getTaskImage();
if (StringUtils.isNotBlank(taskImage)) {
JSONArray jsonArray = JSONArray.parseArray(taskImage);
- ArrayList<String> list = new ArrayList<>(jsonArray.size());
for (Object o : jsonArray) {
- JSONObject jsonObject = JSONObject.parseObject(o.toString());
+ JSONObject jsonObject = (JSONObject)o;
String downloadUrl = null;
try {
+ //1
downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
} catch (UnsupportedEncodingException e) {
throw new RuntimeException(e);
}
- list.add(downloadUrl);
+ jsonObject.put("url", downloadUrl);
}
- xpVehicleCleanVO.setTaskImage(String.join(",", list));
+ xpVehicleCleanVO.setTaskImage(JSONArray.toJSONString(jsonArray));
}
@@ -158,18 +160,18 @@
String taskImage = record.getTaskImage();
if (StringUtils.isNotBlank(taskImage)) {
JSONArray jsonArray = JSONArray.parseArray(taskImage);
- ArrayList<String> list = new ArrayList<>(jsonArray.size());
for (Object o : jsonArray) {
- JSONObject jsonObject = JSONObject.parseObject(o.toString());
+ JSONObject jsonObject = (JSONObject)o;
String downloadUrl = null;
try {
+ //1
downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
} catch (UnsupportedEncodingException e) {
throw new RuntimeException(e);
}
- list.add(downloadUrl);
+ jsonObject.put("url", downloadUrl);
}
- record.setTaskImage(String.join(",", list));
+ record.setTaskImage(JSONArray.toJSONString(jsonArray));
}
data.stream().filter(xpOperationsUser -> xpOperationsUser.getId().equals(record.getOperationsUserId())).findFirst().ifPresent(xpOperationsUser -> record.setCreateBy(xpOperationsUser.getNickName()));
}
--
Gitblit v1.7.1