From dae9cfa94a169a22aadcbcaedda4e92ee3e93d44 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期日, 01 三月 2026 00:53:17 +0800
Subject: [PATCH] bug修改
---
xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpTaskManagementController.java | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpTaskManagementController.java b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpTaskManagementController.java
index fc7ccce..abf03a9 100644
--- a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpTaskManagementController.java
+++ b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpTaskManagementController.java
@@ -3,6 +3,7 @@
import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
+import com.xiaopeng.api.feignClient.account.XpOperationUserClient;
import com.xiaopeng.api.feignClient.vehicleConvoy.XpFleetOperationsClient;
import com.xiaopeng.api.feignClient.vehicleConvoy.XpVehicleClient;
import com.xiaopeng.api.model.account.SysUser;
@@ -35,6 +36,7 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -46,7 +48,9 @@
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -67,6 +71,8 @@
private TokenService tokenService;
@Resource
private IXpErrorTypeService xpErrorTypeService;
+ @Resource
+ private XpOperationUserClient operationUserClient;
@Resource
private XpFleetOperationsClient xpFleetOperationsClient;
@Resource
@@ -95,7 +101,18 @@
xpTaskExportExcel.setTaskTypeName(task.getTaskTypeName());
xpTaskExportExcel.setTaskUrgencyLevel(task.getTaskUrgencyLevel());
xpTaskExportExcel.setTaskDescription(task.getTaskDescription());
- xpTaskExportExcel.setHandleUserName(task.getHandleUserName());
+ if (StringUtils.hasLength(task.getHandleUserId())){
+ String[] split = task.getHandleUserId().split(",");
+
+ List<XpOperationsUser> users = operationUserClient.listByIds(Arrays.stream(split).map(Long::parseLong).collect(Collectors.toList())).getData();
+ if (users!=null){
+ StringBuilder handleUserName = new StringBuilder();
+ for (XpOperationsUser user : users) {
+ handleUserName.append(user.getNickName()).append(";");
+ }
+ xpTaskExportExcel.setHandleUserName(handleUserName.toString());
+ }
+ }
xpTaskExportExcel.setNumber(num);
xpTaskExportExcel.setStatus(task.getStatus());
LocalDateTime createTime = task.getCreateTime();
@@ -150,13 +167,20 @@
xpTaskService.saveTask(dto, reportUserId);
return R.ok();
}
+ @ApiOperation(value = "异常情况上传车辆事故")
+ @PostMapping("/inner/v1/task/saveVehicleAccidentError")
+ public R saveVehicleAccidentError(@RequestParam Long vehicleId) {
+
+ xpTaskService.saveVehicleAccidentError(vehicleId);
+ return R.ok();
+ }
@ApiOperation(value = "任务详情")
@GetMapping("/taskDetail")
public R<TaskManagementDetailVO> taskDetail(Long id) {
return xpTaskService.taskDetail(id);
}
@ApiOperation(value = "查询车辆不分页列表")
- @PostMapping(" /listVehicle")
+ @PostMapping("/listVehicle")
public R<List<XpVehicle>> listVehicle() {
List<XpVehicle> vehicles = xpVehicleClient.listVehicle().getData();
if (vehicles == null){
@@ -177,7 +201,7 @@
@ApiOperation(value = "事故类型列表", response = XpErrorType.class, tags = "管理后台-车辆管理-运营车辆管理")
- @GetMapping(" /errorTypeTreeList")
+ @GetMapping("/errorTypeTreeList")
public R<List<XpErrorType>> errorTypeTreeList() {
return xpErrorTypeService.errorTypeList();
}
--
Gitblit v1.7.1