From 2c91ec3ea012afca747b55648c409545a443d06c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 25 三月 2026 14:56:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpVehicleRepairServiceImpl.java | 49 +++++++++----------------------------------------
1 files changed, 9 insertions(+), 40 deletions(-)
diff --git a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpVehicleRepairServiceImpl.java b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpVehicleRepairServiceImpl.java
index 945ef9e..10b7621 100644
--- a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpVehicleRepairServiceImpl.java
+++ b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpVehicleRepairServiceImpl.java
@@ -22,9 +22,11 @@
import com.xiaopeng.maintenance.model.vo.XpVehicleRepairMgtVO;
import com.xiaopeng.maintenance.model.vo.XpVehicleRepairVO;
import com.xiaopeng.maintenance.service.IXpVehicleRepairService;
+import com.xiaopeng.maintenance.utils.AliOssDownloadUtil;
import com.xiaopeng.maintenance.vo.ChargingStatusVO;
import com.xiaopeng.maintenance.vo.RepairStatusVO;
import org.apache.commons.lang3.StringUtils;
+import org.jetbrains.annotations.NotNull;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -54,6 +56,9 @@
@Autowired
private AliOssService aliOssService;
+ @Autowired
+ private AliOssDownloadUtil aliOssDownloadUtil;
+
@Override
public XpVehicleRepairVO repairDetail(Long id) {
// 查询车辆充电记录
@@ -65,7 +70,7 @@
XpVehicle xpVehicle = xpVehicleClient.queryById(xpVehicleRepair.getVehicleId()).getData();
if (Objects.nonNull(xpVehicle)) {
xpVehicleRepairVO.setPlateNumber(xpVehicle.getPlateNumber());
- xpVehicleRepairVO.setVehiclePictures(xpVehicle.getVehiclePictures());
+ xpVehicleRepairVO.setVehiclePictures(aliOssDownloadUtil.getPictureJSONObject(xpVehicle.getVehiclePictures()));
xpVehicleRepairVO.setAcceptOrTest(xpVehicle.getAcceptOrTest());
xpVehicleRepairVO.setVehicleColor(xpVehicle.getVehicleColor());
}
@@ -171,46 +176,10 @@
}
String RepairMoneyDetail = vo.getRepairMoneyDetail();
- if (StringUtils.isNotBlank(RepairMoneyDetail)) {
- JSONArray jsonArray = JSONArray.parseArray(RepairMoneyDetail);
- for (int i = 0; i < jsonArray.size(); i++) {
- JSONObject jsonObject = jsonArray.getJSONObject(i);
- if (Objects.isNull(jsonObject)) {
- continue;
- }
- String downloadUrl = jsonObject.getString("url");;
- try {
- downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
- } catch (UnsupportedEncodingException e) {
- log.error("获取图片下载地址失败", e);
- }
- jsonObject.put("url", downloadUrl);
- }
- vo.setRepairMoneyDetail(JSONArray.toJSONString(jsonArray));
- }
-
-
-
-
-
+ vo.setRepairMoneyDetail(aliOssDownloadUtil.getPictureJsonArray(RepairMoneyDetail));
String StartRepairPicture = vo.getStartRepairPicture();
- if (StringUtils.isNotBlank(StartRepairPicture)) {
- JSONArray jsonArray = JSONArray.parseArray(StartRepairPicture);
- for (int i = 0; i < jsonArray.size(); i++) {
- JSONObject jsonObject = jsonArray.getJSONObject(i);
- if (Objects.isNull(jsonObject)) {
- continue;
- }
- String downloadUrl = jsonObject.getString("url");;
- try {
- downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
- } catch (UnsupportedEncodingException e) {
- log.error("获取图片下载地址失败", e);
- }
- jsonObject.put("url", downloadUrl);
- }
- vo.setStartRepairPicture(JSONArray.toJSONString(jsonArray));
- }
+ vo.setStartRepairPicture(aliOssDownloadUtil.getPictureJsonArray(StartRepairPicture));
+
records.add(vo);
}
}
--
Gitblit v1.7.1