From 77d130ca8b5925ee1772c24b61c13aeedbef69bc Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 19 三月 2026 10:09:25 +0800
Subject: [PATCH] update
---
xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpTaskServiceImpl.java | 110 ++++++++++++++++++++++++-------------------------------
1 files changed, 48 insertions(+), 62 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 1cee6ec..c63ee60 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
@@ -436,14 +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());
- // 2
+ // 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);
@@ -538,14 +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());
- // 2
+ // 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));
}
@@ -692,19 +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());
String downloadUrl = null;
try {
- // 2
+ // 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());
@@ -837,19 +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());
String downloadUrl = null;
try {
- // 2
+ // 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));
}
@@ -859,19 +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());
String downloadUrl = null;
try {
- // 2
+ // 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));
}
@@ -884,19 +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());
String downloadUrl = null;
try {
- // 2
+ // 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());
@@ -906,19 +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());
String downloadUrl = null;
try {
- // 2
+ // 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());
@@ -927,19 +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());
String downloadUrl = null;
try {
- // 2
+ // 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());
@@ -1035,14 +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());
- // 2
+ // 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());
@@ -1259,19 +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());
String downloadUrl = null;
try {
- // 2
+ // 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));
}
}
@@ -1585,9 +1575,10 @@
if(vehicle.getVehiclePictures()!=null){
JSONObject jsonObject = JSONObject.parseObject(vehicle.getVehiclePictures());
- // 2
+ // 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());
@@ -1606,19 +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());
String downloadUrl = null;
try {
- // 2
+ // 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));
}
@@ -1629,19 +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());
String downloadUrl = null;
try {
- // 2
+ // 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());
@@ -1650,19 +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());
String downloadUrl = null;
try {
- // 2
+ // 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());
@@ -1671,19 +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());
String downloadUrl = null;
try {
- // 2
+ // 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));
}
@@ -1693,19 +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());
String downloadUrl = null;
try {
- // 2
+ // 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