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/XpTaskController.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpTaskController.java b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpTaskController.java
index 05be66c..1ad48cb 100644
--- a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpTaskController.java
+++ b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpTaskController.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.xiaopeng.api.feignClient.vehicleConvoy.XpFleetOperationsClient;
import com.xiaopeng.api.feignClient.vehicleConvoy.XpVehicleClient;
@@ -265,23 +265,24 @@
String taskImage = xpTask.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);
}
- xpTask.setTaskImage(String.join(",", list));
+ xpTask.setTaskImage(JSONArray.toJSONString(jsonArray));
}
return R.ok(xpTask);
}
+
@ApiOperation(value = "执行保险年检检测定时任务", tags = {"定时任务"})
@GetMapping("/base/task/insurance/execute")
public R<?> executeInsuranceTask() {
--
Gitblit v1.7.1