From d597b03477f904bc87bc9c3a984f9bfa485a906d Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 25 三月 2026 18:53:26 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi
---
xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpChargingRecordServiceImpl.java | 69 +++-------------------------------
1 files changed, 7 insertions(+), 62 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 c8643eb..fae79ef 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
@@ -20,6 +20,7 @@
import com.xiaopeng.maintenance.model.query.XpChargingRecordPageQuery;
import com.xiaopeng.maintenance.model.vo.XpChargingRecordVO;
import com.xiaopeng.maintenance.service.IXpChargingRecordService;
+import com.xiaopeng.maintenance.utils.AliOssDownloadUtil;
import com.xiaopeng.maintenance.vo.ChargingStatusVO;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
@@ -55,6 +56,9 @@
@Autowired
private AliOssService aliOssService;
+ @Autowired
+ private AliOssDownloadUtil aliOssDownloadUtil;
+
@Override
public void startCharging(XpChargingRecordStartDTO dto, Long id) {
// 创建车辆充电记录
@@ -265,69 +269,10 @@
}
- String vehiclePictures = vo.getVehiclePictures();
- if (StringUtils.isNotBlank(vehiclePictures)) {
- JSONArray jsonArray = JSONArray.parseArray(vehiclePictures);
- 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.setVehiclePictures(JSONArray.toJSONString(jsonArray));
- }
+ vo.setVehiclePictures(aliOssDownloadUtil.getPictureJSONObject(vo.getVehiclePictures()));
-
-
- String startChargingPicture = vo.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 = 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.setStartChargingPicture(JSONArray.toJSONString(jsonArray));
- }
-
-
-
- String endChargingPicture = vo.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 = 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.setEndChargingPicture(JSONArray.toJSONString(jsonArray));
- }
-
-
-
+ vo.setStartChargingPicture(aliOssDownloadUtil.getPictureJsonArray(vo.getStartChargingPicture()));
+ vo.setEndChargingPicture(aliOssDownloadUtil.getPictureJsonArray(vo.getEndChargingPicture()));
records.add(vo);
}
}
--
Gitblit v1.7.1