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/service/impl/XpChargingRecordServiceImpl.java | 37 +++++++++++++++++++------------------
1 files changed, 19 insertions(+), 18 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 7bee54b..b887044 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
@@ -1,24 +1,23 @@
package com.xiaopeng.maintenance.service.impl;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.xiaopeng.api.feignClient.account.XpOperationUserClient;
import com.xiaopeng.api.feignClient.vehicleConvoy.XpVehicleClient;
import com.xiaopeng.api.model.account.XpOperationsUser;
import com.xiaopeng.api.model.maintenance.XpChargingRecord;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.xiaopeng.api.model.vehicleConvoy.XpVehicle;
import com.xiaopeng.api.vo.automaticPilot.VehiclePosition;
-import com.xiaopeng.evi.oss.service.AliOssService;
-import com.xiaopeng.maintenance.model.query.XpChargingRecordPageQuery;
import com.xiaopeng.common.core.domain.R;
import com.xiaopeng.common.core.web.page.PageInfo;
+import com.xiaopeng.evi.oss.service.AliOssService;
import com.xiaopeng.maintenance.dto.XpChargingRecordStartDTO;
import com.xiaopeng.maintenance.dto.XpChargingRecordStopDTO;
import com.xiaopeng.maintenance.mapper.XpChargingRecordMapper;
+import com.xiaopeng.maintenance.model.query.XpChargingRecordPageQuery;
import com.xiaopeng.maintenance.model.vo.XpChargingRecordVO;
import com.xiaopeng.maintenance.service.IXpChargingRecordService;
import com.xiaopeng.maintenance.vo.ChargingStatusVO;
@@ -119,8 +118,10 @@
String vehiclePictures =xpVehicle.getVehiclePictures();
if (StringUtils.isNotBlank(vehiclePictures)) {
JSONObject jsonObject = JSONObject.parseObject(vehiclePictures);
+ // 1
String downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
- xpChargingRecordVO.setVehiclePictures(downloadUrl);
+ jsonObject.put("url", downloadUrl);
+ xpChargingRecordVO.setVehiclePictures(jsonObject.toJSONString());
}
@@ -231,18 +232,18 @@
String vehiclePictures = vo.getVehiclePictures();
if (StringUtils.isNotBlank(vehiclePictures)) {
JSONArray jsonArray = JSONArray.parseArray(vehiclePictures);
- 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);
}
- vo.setVehiclePictures(String.join(",", list));
+ vo.setVehiclePictures(JSONArray.toJSONString(jsonArray));
}
@@ -250,18 +251,18 @@
String startChargingPicture = vo.getStartChargingPicture();
if (StringUtils.isNotBlank(startChargingPicture)) {
JSONArray jsonArray = JSONArray.parseArray(startChargingPicture);
- 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);
}
- vo.setStartChargingPicture(String.join(",", list));
+ vo.setStartChargingPicture(JSONArray.toJSONString(jsonArray));
}
@@ -269,18 +270,18 @@
String endChargingPicture = vo.getEndChargingPicture();
if (StringUtils.isNotBlank(endChargingPicture)) {
JSONArray jsonArray = JSONArray.parseArray(endChargingPicture);
- 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);
}
- vo.setEndChargingPicture(String.join(",", list));
+ vo.setEndChargingPicture(JSONArray.toJSONString(jsonArray));
}
--
Gitblit v1.7.1