From 78d54919aa0fe901f9ba7b3893cb3e57635a8dfb Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期二, 24 三月 2026 15:10:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpTaskServiceImpl.java | 131 +++++++++++++++++++++++++------------------
1 files changed, 75 insertions(+), 56 deletions(-)
diff --git a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpTaskServiceImpl.java b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpTaskServiceImpl.java
index 8a2abfc..53ce066 100644
--- a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpTaskServiceImpl.java
+++ b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpTaskServiceImpl.java
@@ -152,7 +152,8 @@
if (StringUtils.isNotBlank(vehiclePictures)) {
JSONObject jsonObject = JSONObject.parseObject(vehiclePictures);
//1
- String downloadUrl = jsonObject.getString("url");;
+ String downloadUrl = jsonObject.getString("url");
+ ;
try {
downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
} catch (UnsupportedEncodingException e) {
@@ -209,7 +210,6 @@
pageInfo.setRecords(list);
return pageInfo;
}
-
@Override
@@ -448,7 +448,8 @@
if (Objects.isNull(jsonObject)) {
continue;
}
- String downloadUrl = jsonObject.getString("url");;
+ String downloadUrl = jsonObject.getString("url");
+ ;
try {
downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
} catch (UnsupportedEncodingException e) {
@@ -461,6 +462,7 @@
return R.ok(res);
}
+
@ShardingSphereTransactionType(TransactionType.BASE)
@Transactional(rollbackFor = Exception.class)
@Override
@@ -554,7 +556,8 @@
for (int i = 0; i < jsonArray.size(); i++) {
JSONObject jsonObject = jsonArray.getJSONObject(i);
// 1
- String downloadUrl = jsonObject.getString("url");;
+ String downloadUrl = jsonObject.getString("url");
+ ;
try {
downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
} catch (UnsupportedEncodingException e) {
@@ -613,7 +616,8 @@
if (Objects.isNull(jsonObject)) {
continue;
}
- String downloadUrl = jsonObject.getString("url");;
+ String downloadUrl = jsonObject.getString("url");
+ ;
try {
downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
} catch (UnsupportedEncodingException e) {
@@ -628,8 +632,6 @@
res.setEndRemainingBattery(chargingRecord.getEndRemainingBattery());
-
-
String endChargingPicture = chargingRecord.getEndChargingPicture();
if (StringUtils.isNotBlank(endChargingPicture)) {
JSONArray jsonArray = JSONArray.parseArray(endChargingPicture);
@@ -638,7 +640,8 @@
if (Objects.isNull(jsonObject)) {
continue;
}
- String downloadUrl = jsonObject.getString("url");;
+ String downloadUrl = jsonObject.getString("url");
+ ;
try {
downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
} catch (UnsupportedEncodingException e) {
@@ -709,7 +712,6 @@
res.setRepairReason(vehicleRepair.getRepairReason());
-
String startRepairPicture = vehicleRepair.getStartRepairPicture();
if (StringUtils.isNotBlank(startRepairPicture)) {
JSONArray jsonArray = JSONArray.parseArray(startRepairPicture);
@@ -718,7 +720,8 @@
if (Objects.isNull(jsonObject)) {
continue;
}
- String downloadUrl = jsonObject.getString("url");;
+ String downloadUrl = jsonObject.getString("url");
+ ;
try {
downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
} catch (UnsupportedEncodingException e) {
@@ -855,7 +858,6 @@
res.setSensorCleaning(vehicleDetection.getSensorCleaning());
-
String SensorCleaningPicture = vehicleDetection.getSensorCleaningPicture();
if (StringUtils.isNotBlank(SensorCleaningPicture)) {
JSONArray jsonArray = JSONArray.parseArray(SensorCleaningPicture);
@@ -876,10 +878,8 @@
}
-
-
res.setInteractiveScreen(vehicleDetection.getInteractiveScreen());
- String InteractiveScreenPicture =vehicleDetection.getInteractiveScreenPicture();
+ String InteractiveScreenPicture = vehicleDetection.getInteractiveScreenPicture();
if (StringUtils.isNotBlank(InteractiveScreenPicture)) {
JSONArray jsonArray = JSONArray.parseArray(InteractiveScreenPicture);
for (int i = 0; i < jsonArray.size(); i++) {
@@ -887,7 +887,8 @@
if (Objects.isNull(jsonObject)) {
continue;
}
- String downloadUrl = jsonObject.getString("url");;
+ String downloadUrl = jsonObject.getString("url");
+ ;
try {
downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
} catch (UnsupportedEncodingException e) {
@@ -899,13 +900,10 @@
}
-
res.setHelpButton(vehicleDetection.getHelpButton());
-
-
- String HelpButtonPicture =vehicleDetection.getHelpButtonPicture();
+ String HelpButtonPicture = vehicleDetection.getHelpButtonPicture();
if (StringUtils.isNotBlank(HelpButtonPicture)) {
JSONArray jsonArray = JSONArray.parseArray(HelpButtonPicture);
for (int i = 0; i < jsonArray.size(); i++) {
@@ -913,7 +911,8 @@
if (Objects.isNull(jsonObject)) {
continue;
}
- String downloadUrl = jsonObject.getString("url");;
+ String downloadUrl = jsonObject.getString("url");
+ ;
try {
downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
} catch (UnsupportedEncodingException e) {
@@ -927,8 +926,7 @@
res.setPaymentFunction(vehicleDetection.getPaymentFunction());
-
- String PaymentFunctionPicture =vehicleDetection.getPaymentFunctionPicture();
+ String PaymentFunctionPicture = vehicleDetection.getPaymentFunctionPicture();
if (StringUtils.isNotBlank(PaymentFunctionPicture)) {
JSONArray jsonArray = JSONArray.parseArray(PaymentFunctionPicture);
for (int i = 0; i < jsonArray.size(); i++) {
@@ -936,7 +934,8 @@
if (Objects.isNull(jsonObject)) {
continue;
}
- String downloadUrl = jsonObject.getString("url");;
+ String downloadUrl = jsonObject.getString("url");
+ ;
try {
downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
} catch (UnsupportedEncodingException e) {
@@ -950,7 +949,7 @@
res.setSystemCheck(vehicleDetection.getSystemCheck());
- String SystemCheckPicture =vehicleDetection.getSystemCheckPicture();
+ String SystemCheckPicture = vehicleDetection.getSystemCheckPicture();
if (StringUtils.isNotBlank(SystemCheckPicture)) {
JSONArray jsonArray = JSONArray.parseArray(SystemCheckPicture);
for (int i = 0; i < jsonArray.size(); i++) {
@@ -958,7 +957,8 @@
if (Objects.isNull(jsonObject)) {
continue;
}
- String downloadUrl = jsonObject.getString("url");;
+ String downloadUrl = jsonObject.getString("url");
+ ;
try {
downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
} catch (UnsupportedEncodingException e) {
@@ -1056,7 +1056,6 @@
res.setHandleTime(vehicleDetection.getCreateTime());
-
res.setTaskImage(vehicleDetection.getTaskImage());
String taskImage = res.getTaskImage();
@@ -1067,7 +1066,8 @@
if (Objects.isNull(jsonObject)) {
continue;
}
- String downloadUrl = jsonObject.getString("url");;
+ String downloadUrl = jsonObject.getString("url");
+ ;
try {
downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
} catch (UnsupportedEncodingException e) {
@@ -1289,7 +1289,7 @@
for (XpTaskRecordVO record : records) {
- String taskImage =record.getTaskImage();
+ String taskImage = record.getTaskImage();
if (StringUtils.isNotBlank(taskImage)) {
JSONArray jsonArray = JSONArray.parseArray(taskImage);
for (int i = 0; i < jsonArray.size(); i++) {
@@ -1297,7 +1297,8 @@
if (Objects.isNull(jsonObject)) {
continue;
}
- String downloadUrl = jsonObject.getString("url");;
+ String downloadUrl = jsonObject.getString("url");
+ ;
try {
// 1
downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
@@ -1310,7 +1311,6 @@
}
}
-
pageInfo.setRecords(records);
@@ -1341,10 +1341,10 @@
PageInfo<TaskManagementPageListVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
List<TaskManagementPageListVO> list = this.baseMapper.pageListManagement(pageInfo, query);
for (TaskManagementPageListVO taskManagementPageListVO : list) {
- if (org.springframework.util.StringUtils.hasLength(taskManagementPageListVO.getHandleUserId())){
+ if (org.springframework.util.StringUtils.hasLength(taskManagementPageListVO.getHandleUserId())) {
String[] split = taskManagementPageListVO.getHandleUserId().split(",");
List<XpOperationsUser> users = operationUserClient.listByIds(Arrays.stream(split).map(Long::parseLong).collect(Collectors.toList())).getData();
- if (users!=null){
+ if (users != null) {
StringBuilder handleUserName = new StringBuilder();
for (XpOperationsUser user : users) {
handleUserName.append(user.getNickName()).append(";");
@@ -1415,10 +1415,10 @@
public List<TaskManagementPageListVO> exportList(TaskManagementPageListQuery query) {
List<TaskManagementPageListVO> list = this.baseMapper.exportList(query);
for (TaskManagementPageListVO taskManagementPageListVO : list) {
- if (org.springframework.util.StringUtils.hasLength(taskManagementPageListVO.getHandleUserId())){
+ if (org.springframework.util.StringUtils.hasLength(taskManagementPageListVO.getHandleUserId())) {
String[] split = taskManagementPageListVO.getHandleUserId().split(",");
List<XpOperationsUser> users = operationUserClient.listByIds(Arrays.stream(split).map(Long::parseLong).collect(Collectors.toList())).getData();
- if (users!=null){
+ if (users != null) {
StringBuilder handleUserName = new StringBuilder();
for (XpOperationsUser user : users) {
handleUserName.append(user.getNickName()).append(";");
@@ -1619,15 +1619,15 @@
taskManagementDetectionDetailVO.setVehicleVin(vehicle.getVehicleVin());
taskManagementDetectionDetailVO.setVehicleLocation(task.getVehicleLocation());
- if(vehicle.getVehiclePictures()!=null){
+ if (vehicle.getVehiclePictures() != null) {
JSONObject jsonObject = JSONObject.parseObject(vehicle.getVehiclePictures());
// 1
- String downloadUrl = jsonObject.getString("url");;
- try {
- downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
- } catch (UnsupportedEncodingException e) {
- log.error("获取图片下载地址失败", e);
- }
+ 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);
taskManagementDetectionDetailVO.setVehiclePictures(jsonObject.toJSONString());
}
@@ -1653,7 +1653,7 @@
if (Objects.isNull(jsonObject)) {
continue;
}
- String downloadUrl = jsonObject.getString("url");;
+ String downloadUrl = jsonObject.getString("url");
try {
downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
} catch (UnsupportedEncodingException e) {
@@ -1665,11 +1665,10 @@
}
-
taskManagementDetectionDetailVO.setInteractiveScreen(vehicleDetection.getInteractiveScreen());
- String InteractiveScreenPicture =vehicleDetection.getInteractiveScreenPicture();
+ String InteractiveScreenPicture = vehicleDetection.getInteractiveScreenPicture();
if (StringUtils.isNotBlank(InteractiveScreenPicture)) {
JSONArray jsonArray = JSONArray.parseArray(InteractiveScreenPicture);
for (int i = 0; i < jsonArray.size(); i++) {
@@ -1677,7 +1676,7 @@
if (Objects.isNull(jsonObject)) {
continue;
}
- String downloadUrl = jsonObject.getString("url");;
+ String downloadUrl = jsonObject.getString("url");
try {
downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
} catch (UnsupportedEncodingException e) {
@@ -1691,7 +1690,7 @@
taskManagementDetectionDetailVO.setHelpButton(vehicleDetection.getHelpButton());
- String HelpButtonPicture =vehicleDetection.getHelpButtonPicture();
+ String HelpButtonPicture = vehicleDetection.getHelpButtonPicture();
if (StringUtils.isNotBlank(HelpButtonPicture)) {
JSONArray jsonArray = JSONArray.parseArray(HelpButtonPicture);
for (int i = 0; i < jsonArray.size(); i++) {
@@ -1713,7 +1712,7 @@
taskManagementDetectionDetailVO.setPaymentFunction(vehicleDetection.getPaymentFunction());
- String PaymentFunctionPicture =vehicleDetection.getPaymentFunctionPicture();
+ String PaymentFunctionPicture = vehicleDetection.getPaymentFunctionPicture();
if (StringUtils.isNotBlank(PaymentFunctionPicture)) {
JSONArray jsonArray = JSONArray.parseArray(PaymentFunctionPicture);
for (int i = 0; i < jsonArray.size(); i++) {
@@ -1736,7 +1735,7 @@
taskManagementDetectionDetailVO.setSystemCheck(vehicleDetection.getSystemCheck());
- String SystemCheckPicture =vehicleDetection.getSystemCheckPicture();
+ String SystemCheckPicture = vehicleDetection.getSystemCheckPicture();
if (StringUtils.isNotBlank(SystemCheckPicture)) {
JSONArray jsonArray = JSONArray.parseArray(SystemCheckPicture);
for (int i = 0; i < jsonArray.size(); i++) {
@@ -1744,7 +1743,8 @@
if (Objects.isNull(jsonObject)) {
continue;
}
- String downloadUrl = jsonObject.getString("url");;
+ String downloadUrl = jsonObject.getString("url");
+ ;
try {
downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
} catch (UnsupportedEncodingException e) {
@@ -1975,7 +1975,27 @@
res.setErrorTypeList(xpErrorTypes);
res.setStatus(task.getStatus());
res.setTaskDescription(task.getTaskDescription());
- res.setTaskImage(task.getTaskImage());
+
+ String taskImage = res.getTaskImage();
+ if (StringUtils.isNotBlank(taskImage)) {
+ JSONArray jsonArray = JSONArray.parseArray(taskImage);
+ 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);
+ }
+ res.setTaskImage(JSONArray.toJSONString(jsonArray));
+ }
+
res.setId(id);
res.setVehicleId(vehicle.getId());
res.setTaskUrgencyLevel(task.getTaskUrgencyLevel());
@@ -1984,14 +2004,14 @@
res.setVehicleCode(vehicle.getVehicleCode());
res.setVehicleLocation(task.getVehicleLocation());
res.setVehicleVin(vehicle.getVehicleVin());
- if (task.getReportUserId().equals(0L)){
+ if (task.getReportUserId().equals(0L)) {
// 系统补偿上传车辆异常任务 为系统创建
res.setReportUserId(0L);
res.setReportUserName("系统");
// todo 临时设置 待客户确认默认头像和电话号码
res.setReportUserPhone("111111");
res.setReportUserAvatar("[]");
- }else{
+ } else {
if (Objects.nonNull(task.getTaskSource()) && task.getTaskSource().equals(2)) {
List<SysUser> list = sysUserClient.listByIds(Lists.newArrayList(task.getReportUserId())).getData();
if (CollUtil.isNotEmpty(list)) {
@@ -2000,9 +2020,9 @@
res.setReportUserName(sysUser.getNickName());
res.setReportUserPhone(sysUser.getPhoneNumber());
}
- }else{
+ } else {
XpOperationsUser data = xpOperationUserClient.queryById(task.getReportUserId()).getData();
- if (data != null ) {
+ if (data != null) {
res.setReportUserId(data.getId());
res.setReportUserName(data.getNickName());
res.setReportUserPhone(data.getPhoneNumber());
@@ -2011,7 +2031,7 @@
}
}
- if (task.getHandleUserId()!=null && task.getHandleUserId().split(",").length == 1) {
+ if (task.getHandleUserId() != null && task.getHandleUserId().split(",").length == 1) {
XpOperationsUser operationsUser = xpOperationUserClient.queryById(Long.valueOf(task.getHandleUserId())).getData();
if (operationsUser != null) {
res.setHandleUserId(operationsUser.getId());
@@ -2037,7 +2057,6 @@
managementDetailVO.setAccidentDetailVO(res);
}
-
return R.ok(managementDetailVO);
--
Gitblit v1.7.1