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/XpVehicleDetectionController.java | 93 ++++++++++++++++++++++++----------------------
1 files changed, 48 insertions(+), 45 deletions(-)
diff --git a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleDetectionController.java b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleDetectionController.java
index e564ccb..3831e36 100644
--- a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleDetectionController.java
+++ b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleDetectionController.java
@@ -1,10 +1,9 @@
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.account.XpOperationUserClient;
-import com.xiaopeng.api.feignClient.vehicleConvoy.XpVehicleClient;
import com.xiaopeng.common.core.domain.R;
import com.xiaopeng.common.core.web.page.PageInfo;
import com.xiaopeng.common.security.service.TokenService;
@@ -26,7 +25,6 @@
import javax.validation.Valid;
import java.io.UnsupportedEncodingException;
import java.time.LocalDateTime;
-import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
@@ -74,6 +72,7 @@
}
+
/**
* 车辆详情-车辆运维-车辆检测提交
*/
@@ -103,98 +102,100 @@
String vehiclePictures = xpVehicleDetectionVO.getVehiclePictures();
if (vehiclePictures != null && !vehiclePictures.isEmpty()) {
JSONObject jsonObject = JSONObject.parseObject(vehiclePictures);
+ // 1
String downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
- xpVehicleDetectionVO.setVehiclePictures(downloadUrl);
+ jsonObject.put("url", downloadUrl);
+ xpVehicleDetectionVO.setVehiclePictures(jsonObject.toJSONString());
}
String sensorCleaningPicture = xpVehicleDetectionVO.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);
}
- xpVehicleDetectionVO.setSensorCleaningPicture(String.join(",", list));
+ xpVehicleDetectionVO.setSensorCleaningPicture(JSONArray.toJSONString(jsonArray));
}
String interactiveScreenPicture = xpVehicleDetectionVO.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);
}
- xpVehicleDetectionVO.setInteractiveScreenPicture(String.join(",", list));
+ xpVehicleDetectionVO.setInteractiveScreenPicture(JSONArray.toJSONString(jsonArray));
}
String helpButtonPicture = xpVehicleDetectionVO.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);
}
- xpVehicleDetectionVO.setHelpButtonPicture(String.join(",", list));
+ xpVehicleDetectionVO.setHelpButtonPicture(JSONArray.toJSONString(jsonArray));
}
String paymentFunctionPicture = xpVehicleDetectionVO.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);
}
- xpVehicleDetectionVO.setPaymentFunctionPicture(String.join(",", list));
+ xpVehicleDetectionVO.setPaymentFunctionPicture(JSONArray.toJSONString(jsonArray));
}
String systemCheckPicture = xpVehicleDetectionVO.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);
}
- xpVehicleDetectionVO.setSystemCheckPicture(String.join(",", list));
+ xpVehicleDetectionVO.setSystemCheckPicture(JSONArray.toJSONString(jsonArray));
}
@@ -214,98 +215,100 @@
String vehiclePictures = xpVehicleDetectionVO.getVehiclePictures();
if (vehiclePictures != null && !vehiclePictures.isEmpty()) {
JSONObject jsonObject = JSONObject.parseObject(vehiclePictures);
+ // 1
String downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
- xpVehicleDetectionVO.setVehiclePictures(downloadUrl);
+ jsonObject.put("url", downloadUrl);
+ xpVehicleDetectionVO.setVehiclePictures(jsonObject.toJSONString());
}
String sensorCleaningPicture = xpVehicleDetectionVO.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);
}
- xpVehicleDetectionVO.setSensorCleaningPicture(String.join(",", list));
+ xpVehicleDetectionVO.setSensorCleaningPicture(JSONArray.toJSONString(jsonArray));
}
String interactiveScreenPicture = xpVehicleDetectionVO.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);
}
- xpVehicleDetectionVO.setInteractiveScreenPicture(String.join(",", list));
+ xpVehicleDetectionVO.setInteractiveScreenPicture(JSONArray.toJSONString(jsonArray));
}
String helpButtonPicture = xpVehicleDetectionVO.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);
}
- xpVehicleDetectionVO.setHelpButtonPicture(String.join(",", list));
+ xpVehicleDetectionVO.setHelpButtonPicture(JSONArray.toJSONString(jsonArray));
}
String paymentFunctionPicture = xpVehicleDetectionVO.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);
}
- xpVehicleDetectionVO.setPaymentFunctionPicture(String.join(",", list));
+ xpVehicleDetectionVO.setPaymentFunctionPicture(JSONArray.toJSONString(jsonArray));
}
String systemCheckPicture = xpVehicleDetectionVO.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);
}
- xpVehicleDetectionVO.setSystemCheckPicture(String.join(",", list));
+ xpVehicleDetectionVO.setSystemCheckPicture(JSONArray.toJSONString(jsonArray));
}
}
--
Gitblit v1.7.1