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/service/impl/XpTaskServiceImpl.java | 146 +++++++++++++++++++++++++-----------------------
1 files changed, 75 insertions(+), 71 deletions(-)
diff --git a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpTaskServiceImpl.java b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpTaskServiceImpl.java
index f275acf..9146a2e 100644
--- a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpTaskServiceImpl.java
+++ b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpTaskServiceImpl.java
@@ -1,7 +1,7 @@
package com.xiaopeng.maintenance.service.impl;
import cn.hutool.core.collection.CollUtil;
-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.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -149,8 +149,10 @@
String vehiclePictures = workBenchVO.getVehiclePictures();
if (StringUtils.isNotBlank(vehiclePictures)) {
JSONObject jsonObject = JSONObject.parseObject(vehiclePictures);
+ //1
String downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
- workBenchVO.setVehiclePictures(downloadUrl);
+ jsonObject.put("url", downloadUrl);
+ workBenchVO.setVehiclePictures(jsonObject.toJSONString());
}
}
@@ -434,13 +436,13 @@
String taskImage = res.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;
+ // 1
String downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
- list.add(downloadUrl);
+ jsonObject.put("url", downloadUrl);
}
- res.setTaskImage(String.join(",", list));
+ res.setTaskImage(JSONArray.toJSONString(jsonArray));
}
return R.ok(res);
@@ -535,13 +537,13 @@
String taskImage = res.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;
+ // 1
String downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
- list.add(downloadUrl);
+ jsonObject.put("url", downloadUrl);
}
- res.setTaskImage(String.join(",", list));
+ res.setTaskImage(JSONArray.toJSONString(jsonArray));
}
@@ -587,18 +589,18 @@
String startChargingPicture = res.getStartChargingPicture();
if (StringUtils.isNotBlank(startChargingPicture)) {
JSONArray jsonArray = JSONArray.parseArray(startChargingPicture);
- 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);
}
- res.setStartChargingPicture(String.join(",", list));
+ res.setStartChargingPicture(JSONArray.toJSONString(jsonArray));
}
res.setStartTime(chargingRecord.getStartTime());
@@ -610,18 +612,18 @@
String endChargingPicture = chargingRecord.getEndChargingPicture();
if (StringUtils.isNotBlank(endChargingPicture)) {
JSONArray jsonArray = JSONArray.parseArray(endChargingPicture);
- 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);
}
- res.setEndChargingPicture(String.join(",", list));
+ res.setEndChargingPicture(JSONArray.toJSONString(jsonArray));
}
res.setEndTime(chargingRecord.getEndTime());
@@ -688,18 +690,18 @@
String startRepairPicture = vehicleRepair.getStartRepairPicture();
if (StringUtils.isNotBlank(startRepairPicture)) {
JSONArray jsonArray = JSONArray.parseArray(startRepairPicture);
- 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);
}
- res.setStartRepairPicture(String.join(",", list));
+ res.setStartRepairPicture(JSONArray.toJSONString(jsonArray));
}
res.setRepairMoney(vehicleRepair.getRepairMoney());
@@ -832,18 +834,18 @@
String SensorCleaningPicture = vehicleDetection.getSensorCleaningPicture();
if (StringUtils.isNotBlank(SensorCleaningPicture)) {
JSONArray jsonArray = JSONArray.parseArray(SensorCleaningPicture);
- 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);
}
- res.setSensorCleaningPicture(String.join(",", list));
+ res.setSensorCleaningPicture(JSONArray.toJSONString(jsonArray));
}
@@ -853,18 +855,18 @@
String InteractiveScreenPicture =vehicleDetection.getInteractiveScreenPicture();
if (StringUtils.isNotBlank(InteractiveScreenPicture)) {
JSONArray jsonArray = JSONArray.parseArray(InteractiveScreenPicture);
- 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);
}
- res.setInteractiveScreenPicture(String.join(",", list));
+ res.setInteractiveScreenPicture(JSONArray.toJSONString(jsonArray));
}
@@ -877,18 +879,18 @@
String HelpButtonPicture =vehicleDetection.getHelpButtonPicture();
if (StringUtils.isNotBlank(HelpButtonPicture)) {
JSONArray jsonArray = JSONArray.parseArray(HelpButtonPicture);
- 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);
}
- res.setHelpButtonPicture(String.join(",", list));
+ res.setHelpButtonPicture(JSONArray.toJSONString(jsonArray));
}
res.setPaymentFunction(vehicleDetection.getPaymentFunction());
@@ -898,18 +900,18 @@
String PaymentFunctionPicture =vehicleDetection.getPaymentFunctionPicture();
if (StringUtils.isNotBlank(PaymentFunctionPicture)) {
JSONArray jsonArray = JSONArray.parseArray(PaymentFunctionPicture);
- 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);
}
- res.setPaymentFunctionPicture(String.join(",", list));
+ res.setPaymentFunctionPicture(JSONArray.toJSONString(jsonArray));
}
res.setSystemCheck(vehicleDetection.getSystemCheck());
@@ -918,18 +920,18 @@
String SystemCheckPicture =vehicleDetection.getSystemCheckPicture();
if (StringUtils.isNotBlank(SystemCheckPicture)) {
JSONArray jsonArray = JSONArray.parseArray(SystemCheckPicture);
- 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);
}
- res.setSystemCheckPicture(String.join(",", list));
+ res.setSystemCheckPicture(JSONArray.toJSONString(jsonArray));
}
res.setCheckTime(vehicleDetection.getCheckTime());
res.setOperationsUserId(vehicleDetection.getOperationsUserId());
@@ -1025,13 +1027,13 @@
String taskImage = res.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;
+ // 1
String downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
- list.add(downloadUrl);
+ jsonObject.put("url", downloadUrl);
}
- res.setTaskImage(String.join(",", list));
+ res.setTaskImage(JSONArray.toJSONString(jsonArray));
}
res.setOperationUserId(vehicleDetection.getOperationsUserId());
@@ -1248,18 +1250,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));
}
}
@@ -1573,8 +1575,10 @@
if(vehicle.getVehiclePictures()!=null){
JSONObject jsonObject = JSONObject.parseObject(vehicle.getVehiclePictures());
+ // 1
String downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
- taskManagementDetectionDetailVO.setVehiclePictures(downloadUrl);
+ jsonObject.put("url", downloadUrl);
+ taskManagementDetectionDetailVO.setVehiclePictures(jsonObject.toJSONString());
}
taskManagementDetectionDetailVO.setTaskCode(task.getTaskCode());
@@ -1593,18 +1597,18 @@
String SensorCleaningPicture = vehicleDetection.getSensorCleaningPicture();
if (StringUtils.isNotBlank(SensorCleaningPicture)) {
JSONArray jsonArray = JSONArray.parseArray(SensorCleaningPicture);
- 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);
}
- taskManagementDetectionDetailVO.setSensorCleaningPicture(String.join(",", list));
+ taskManagementDetectionDetailVO.setSensorCleaningPicture(JSONArray.toJSONString(jsonArray));
}
@@ -1615,18 +1619,18 @@
String InteractiveScreenPicture =vehicleDetection.getInteractiveScreenPicture();
if (StringUtils.isNotBlank(InteractiveScreenPicture)) {
JSONArray jsonArray = JSONArray.parseArray(InteractiveScreenPicture);
- 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);
}
- taskManagementDetectionDetailVO.setInteractiveScreenPicture(String.join(",", list));
+ taskManagementDetectionDetailVO.setInteractiveScreenPicture(JSONArray.toJSONString(jsonArray));
}
taskManagementDetectionDetailVO.setHelpButton(vehicleDetection.getHelpButton());
@@ -1635,18 +1639,18 @@
String HelpButtonPicture =vehicleDetection.getHelpButtonPicture();
if (StringUtils.isNotBlank(HelpButtonPicture)) {
JSONArray jsonArray = JSONArray.parseArray(HelpButtonPicture);
- 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);
}
- taskManagementDetectionDetailVO.setHelpButtonPicture(String.join(",", list));
+ taskManagementDetectionDetailVO.setHelpButtonPicture(JSONArray.toJSONString(jsonArray));
}
taskManagementDetectionDetailVO.setPaymentFunction(vehicleDetection.getPaymentFunction());
@@ -1655,18 +1659,18 @@
String PaymentFunctionPicture =vehicleDetection.getPaymentFunctionPicture();
if (StringUtils.isNotBlank(PaymentFunctionPicture)) {
JSONArray jsonArray = JSONArray.parseArray(PaymentFunctionPicture);
- 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);
}
- taskManagementDetectionDetailVO.setPaymentFunctionPicture(String.join(",", list));
+ taskManagementDetectionDetailVO.setPaymentFunctionPicture(JSONArray.toJSONString(jsonArray));
}
@@ -1676,18 +1680,18 @@
String SystemCheckPicture =vehicleDetection.getSystemCheckPicture();
if (StringUtils.isNotBlank(SystemCheckPicture)) {
JSONArray jsonArray = JSONArray.parseArray(SystemCheckPicture);
- 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);
}
- taskManagementDetectionDetailVO.setSystemCheckPicture(String.join(",", list));
+ taskManagementDetectionDetailVO.setSystemCheckPicture(JSONArray.toJSONString(jsonArray));
}
taskManagementDetectionDetailVO.setCheckTime(vehicleDetection.getCheckTime());
--
Gitblit v1.7.1