From 8fb7dde57b835463a6786a2e038f0ecd3dba827b Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 11 三月 2026 16:21:54 +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/controller/XpTaskManagementController.java | 33 ++++++++++++++++++++++++---------
1 files changed, 24 insertions(+), 9 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 abf03a9..00db2eb 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
@@ -77,17 +77,20 @@
private XpFleetOperationsClient xpFleetOperationsClient;
@Resource
private XpVehicleClient xpVehicleClient;
+
@ApiOperation(value = "事故类型列表", response = XpErrorType.class)
@GetMapping("/errorTypeList")
public R<List<XpErrorType>> errorTypeList() {
return xpErrorTypeService.errorTypeList();
}
+
@ApiOperation(value = "任务中心列表", response = TaskManagementPageListVO.class)
@PostMapping("/pageList")
public R<PageInfo<TaskManagementPageListVO>> pageListManagement(@RequestBody TaskManagementPageListQuery query) {
PageInfo<TaskManagementPageListVO> pageList = xpTaskService.pageListManagement(query);
return R.ok(pageList);
}
+
@ApiOperation(value = "任务工单导出")
@PostMapping(value = "/exportExcel")
public void exportExcel(@RequestBody TaskManagementPageListQuery query) {
@@ -101,11 +104,11 @@
xpTaskExportExcel.setTaskTypeName(task.getTaskTypeName());
xpTaskExportExcel.setTaskUrgencyLevel(task.getTaskUrgencyLevel());
xpTaskExportExcel.setTaskDescription(task.getTaskDescription());
- if (StringUtils.hasLength(task.getHandleUserId())){
+ 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){
+ if (users != null) {
StringBuilder handleUserName = new StringBuilder();
for (XpOperationsUser user : users) {
handleUserName.append(user.getNickName()).append(";");
@@ -143,23 +146,27 @@
}
}
+
/**
* 管理后台-车辆管理-运营车辆管理-删除任务/事故
+ *
* @param id
* @return
*/
@ApiOperation(value = "删除任务/事故")
@DeleteMapping("/deleteTaskById")
- public R<?> deleteTaskById(@ApiParam(name = "id", value = "任务ID")Long id){
+ public R<?> deleteTaskById(@ApiParam(name = "id", value = "任务ID") Long id) {
xpTaskService.deleteTaskById(id);
return R.ok();
}
+
@ApiOperation(value = "任务分配")
@GetMapping("/assigneeTask")
- public R assigneeTask(@ApiParam(name = "id", value = "任务ID") Long id, @ApiParam(name = "handlerUserId", value = "处理人id")Long handlerUserId) {
+ public R assigneeTask(@ApiParam(name = "id", value = "任务ID") Long id, @ApiParam(name = "handlerUserId", value = "处理人id") Long handlerUserId) {
Long assigneeUserId = tokenService.getLoginUser().getSysUser().getId();
- return xpTaskService.assigneeTask(id, handlerUserId,assigneeUserId);
+ return xpTaskService.assigneeTask(id, handlerUserId, assigneeUserId);
}
+
@ApiOperation(value = "创建任务事故")
@PostMapping("/saveTask")
public R saveTask(@RequestBody SaveErrorTaskDto dto) {
@@ -167,23 +174,30 @@
xpTaskService.saveTask(dto, reportUserId);
return R.ok();
}
- @ApiOperation(value = "异常情况上传车辆事故")
- @PostMapping("/inner/v1/task/saveVehicleAccidentError")
- public R saveVehicleAccidentError(@RequestParam Long vehicleId) {
+
+ /**
+ * 内部调用-添加车辆异常任务
+ * @param vehicleId
+ * @return
+ */
+ @PostMapping("/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")
public R<List<XpVehicle>> listVehicle() {
List<XpVehicle> vehicles = xpVehicleClient.listVehicle().getData();
- if (vehicles == null){
+ if (vehicles == null) {
return R.ok(new ArrayList<>());
}
return R.ok(vehicles);
@@ -191,6 +205,7 @@
/**
* 通过车辆id查询任务事故分页列表
+ *
* @return
*/
@ApiOperation(value = "通过车辆id查询任务事故分页列表", tags = {"管理后台-车辆管理-运营车辆管理"})
--
Gitblit v1.7.1