From 3896cbb9ed6fa03d90a4032238dad7b2f39c607c Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期二, 24 三月 2026 20:23:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpChargingRecordServiceImpl.java | 40 +++++++++++++++++++++++++++++++++++-----
1 files changed, 35 insertions(+), 5 deletions(-)
diff --git a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpChargingRecordServiceImpl.java b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpChargingRecordServiceImpl.java
index d300813..53e1143 100644
--- a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpChargingRecordServiceImpl.java
+++ b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpChargingRecordServiceImpl.java
@@ -112,9 +112,6 @@
XpVehicle xpVehicle = xpVehicleClient.queryById(xpChargingRecord.getVehicleId()).getData();
if (Objects.nonNull(xpVehicle)) {
xpChargingRecordVO.setPlateNumber(xpVehicle.getPlateNumber());
-
-
-
String vehiclePictures =xpVehicle.getVehiclePictures();
if (StringUtils.isNotBlank(vehiclePictures)) {
JSONObject jsonObject = JSONObject.parseObject(vehiclePictures);
@@ -128,8 +125,6 @@
jsonObject.put("url", downloadUrl);
xpChargingRecordVO.setVehiclePictures(jsonObject.toJSONString());
}
-
-
xpChargingRecordVO.setAcceptOrTest(xpVehicle.getAcceptOrTest());
xpChargingRecordVO.setVehicleColor(xpVehicle.getVehicleColor());
}
@@ -144,6 +139,41 @@
}
xpChargingRecordVO.setStartMileageRange(Objects.nonNull(xpChargingRecord.getStartMileageRange()) ? xpChargingRecord.getStartMileageRange() : 0F);
xpChargingRecordVO.setEndMileageRange(Objects.nonNull(xpChargingRecord.getEndMileageRange()) ? xpChargingRecord.getEndMileageRange() : 0F);
+
+ // 图片封装
+ try {
+ // 开始
+ String startChargingPicture = xpChargingRecordVO.getStartChargingPicture();
+ if (StringUtils.isNotBlank(startChargingPicture)) {
+ JSONArray jsonArray = JSONArray.parseArray(startChargingPicture);
+ for (int i = 0; i < jsonArray.size(); i++) {
+ JSONObject jsonObject = jsonArray.getJSONObject(i);
+ if (Objects.isNull(jsonObject)) {
+ continue;
+ }
+ String downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
+ jsonObject.put("url", downloadUrl);
+ }
+ xpChargingRecordVO.setStartChargingPicture(JSONArray.toJSONString(jsonArray));
+ }
+ // 结束
+ String endChargingPicture = xpChargingRecordVO.getEndChargingPicture();
+ if (StringUtils.isNotBlank(endChargingPicture)) {
+ JSONArray jsonArray = JSONArray.parseArray(endChargingPicture);
+ for (int i = 0; i < jsonArray.size(); i++) {
+ JSONObject jsonObject = jsonArray.getJSONObject(i);
+ if (Objects.isNull(jsonObject)) {
+ continue;
+ }
+ String downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
+ jsonObject.put("url", downloadUrl);
+ }
+ xpChargingRecordVO.setEndChargingPicture(JSONArray.toJSONString(jsonArray));
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
return xpChargingRecordVO;
}
--
Gitblit v1.7.1