From 55ac5e29404dd2e74c77a604a63e4dd991a38bb0 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 12 二月 2026 16:43:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpTaskController.java | 80 ++++++++++++++++++++++------------------
1 files changed, 44 insertions(+), 36 deletions(-)
diff --git a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpTaskController.java b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpTaskController.java
index da7fc34..9e0ca36 100644
--- a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpTaskController.java
+++ b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpTaskController.java
@@ -14,20 +14,21 @@
import com.xiaopeng.maintenance.dto.SaveRoutineDetailDto;
import com.xiaopeng.maintenance.dto.SaveVehicleAccidentDto;
import com.xiaopeng.maintenance.model.query.TaskPageListQuery;
-import com.xiaopeng.maintenance.model.vo.TaskAccidentDetailVO;
-import com.xiaopeng.maintenance.model.vo.TaskChargingDetailVO;
-import com.xiaopeng.maintenance.model.vo.TaskPageListVO;
-import com.xiaopeng.maintenance.model.vo.TaskRoutineDetailVO;
+import com.xiaopeng.maintenance.model.query.XpTaskRecordPageQuery;
+import com.xiaopeng.maintenance.model.vo.*;
import com.xiaopeng.maintenance.service.IXpErrorTypeService;
import com.xiaopeng.maintenance.service.XpTaskService;
import com.xiaopeng.maintenance.vo.VehicleListVO;
-import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
+import javax.validation.Valid;
import java.util.ArrayList;
import java.util.List;
@@ -41,8 +42,6 @@
*/
@RestController
@Slf4j
-@Api(tags = "运维APP-任务中心")
-@RequestMapping("/api/v1/task")
public class XpTaskController {
@Resource
private XpTaskService xpTaskService;
@@ -54,25 +53,25 @@
private XpFleetOperationsClient xpFleetOperationsClient;
@Resource
private XpVehicleClient xpVehicleClient;
- @ApiOperation(value = "任务中心列表", response = XpErrorType.class)
- @GetMapping("/errorTypeList")
+ @ApiOperation(value = "任务中心列表", response = XpErrorType.class, tags = "运维APP-任务中心")
+ @GetMapping("/api/v1/task/errorTypeList")
public R<List<XpErrorType>> errorTypeList() {
return xpErrorTypeService.errorTypeList();
}
- @ApiOperation(value = "任务中心列表", response = TaskPageListVO.class)
- @PostMapping("/pageList")
+ @ApiOperation(value = "任务中心列表", response = TaskPageListVO.class, tags = "运维APP-任务中心")
+ @PostMapping("/api/v1/task/pageList")
public R<PageInfo<TaskPageListVO>> pageList(@RequestBody TaskPageListQuery query) {
PageInfo<TaskPageListVO> pageList = xpTaskService.pageList(query);
return R.ok(pageList);
}
- @ApiOperation(value = "事故任务确认到达")
- @GetMapping("/confirmArrive")
+ @ApiOperation(value = "事故任务确认到达", tags = "运维APP-任务中心")
+ @GetMapping("/api/v1/task/confirmArrive")
@Transactional
public R confirmArrive( Integer id) {
return xpTaskService.confirmArrive(id);
}
- @ApiOperation(value = "查询车辆不分页列表")
- @PostMapping("/listVehicle")
+ @ApiOperation(value = "查询车辆不分页列表", tags = "运维APP-任务中心")
+ @PostMapping("/api/v1/task/listVehicle")
public R<List<VehicleListVO>> listVehicle() {
LoginOperationUser loginOperationUser = tokenService.getLoginOperationUser();
XpOperationsUser xpOperationsUser = loginOperationUser.getXpOperationsUser();
@@ -102,60 +101,60 @@
return R.ok(new ArrayList<>());
}
- @ApiOperation(value = "上传车辆事故")
- @PostMapping("/saveVehicleAccident")
+ @ApiOperation(value = "上传车辆事故", tags = "运维APP-任务中心")
+ @PostMapping("/api/v1/task/saveVehicleAccident")
public R saveVehicleAccident(@RequestBody SaveVehicleAccidentDto dto) {
LoginOperationUser loginOperationUser = tokenService.getLoginOperationUser();
XpOperationsUser xpOperationsUser = loginOperationUser.getXpOperationsUser();
xpTaskService.saveVehicleAccident(dto, xpOperationsUser);
return R.ok();
}
- @ApiOperation(value = "车辆事故任务详情")
- @GetMapping("/vehicleAccidentDetail")
+ @ApiOperation(value = "车辆事故任务详情", tags = "运维APP-任务中心")
+ @GetMapping("/api/v1/task/vehicleAccidentDetail")
public R<TaskAccidentDetailVO> vehicleAccidentDetail(Long id) {
return xpTaskService.vehicleAccidentDetail(id);
}
- @ApiOperation(value = "车辆其他常规任务详情")
- @GetMapping("/vehicleRoutineDetail")
+ @ApiOperation(value = "车辆其他常规任务详情", tags = "运维APP-任务中心")
+ @GetMapping("/api/v1/task/vehicleRoutineDetail")
public R<TaskRoutineDetailVO> vehicleRoutineDetail(Long id) {
return xpTaskService.vehicleRoutineDetail(id);
}
- @ApiOperation(value = "上传车辆其他常规任务详情")
- @PostMapping("/saveRoutineDetail")
+ @ApiOperation(value = "上传车辆其他常规任务详情", tags = "运维APP-任务中心")
+ @PostMapping("/api/v1/task/saveRoutineDetail")
public R saveRoutineDetail(@RequestBody SaveRoutineDetailDto dto) {
LoginOperationUser loginOperationUser = tokenService.getLoginOperationUser();
Long id = loginOperationUser.getId();
return xpTaskService.saveRoutineDetail(dto, id);
}
- @ApiOperation(value = "车辆常规充电任务详情")
- @GetMapping("/chargingDetail")
+ @ApiOperation(value = "车辆常规充电任务详情", tags = "运维APP-任务中心")
+ @GetMapping("/api/v1/task/chargingDetail")
public R<TaskChargingDetailVO> chargingDetail(Long id) {
return xpTaskService.chargingDetail(id);
}
- @ApiOperation(value = "车辆常规维修任务详情")
- @GetMapping("/repairDetail")
+ @ApiOperation(value = "车辆常规维修任务详情", tags = "运维APP-任务中心")
+ @GetMapping("/api/v1/task/repairDetail")
public R<com.xiaopeng.maintenance.vo.TaskRepairDetailVO> repairDetail(Long id) {
return xpTaskService.repairDetail(id);
}
- @ApiOperation(value = "车辆常规整备任务详情")
- @GetMapping("/preparationDetail")
+ @ApiOperation(value = "车辆常规整备任务详情", tags = "运维APP-任务中心")
+ @GetMapping("/api/v1/task/preparationDetail")
public R<com.xiaopeng.maintenance.vo.TaskPreparationDetailVO> preparationDetail(Long id) {
return xpTaskService.preparationDetail(id);
}
- @ApiOperation(value = "车辆常规检测任务详情")
- @GetMapping("/detectionDetail")
+ @ApiOperation(value = "车辆常规检测任务详情", tags = "运维APP-任务中心")
+ @GetMapping("/api/v1/task/detectionDetail")
public R<com.xiaopeng.maintenance.vo.TaskDetectionDetailVO> detectionDetail(Long id) {
return xpTaskService.detectionDetail(id);
}
- @ApiOperation(value = "车辆常规洗车任务详情")
- @GetMapping("/cleanDetail")
+ @ApiOperation(value = "车辆常规洗车任务详情", tags = "运维APP-任务中心")
+ @GetMapping("/api/v1/task/cleanDetail")
public R<com.xiaopeng.maintenance.vo.TaskCleanDetailVO> cleanDetail(Long id) {
return xpTaskService.cleanDetail(id);
}
- @ApiOperation(value = "处理车辆事故")
- @PostMapping("/handleVehicleAccident")
+ @ApiOperation(value = "处理车辆事故", tags = "运维APP-任务中心")
+ @PostMapping("/api/v1/task/handleVehicleAccident")
@Transactional
public R handleVehicleAccident(@RequestBody HandleVehicleAccidentDto dto) {
LoginOperationUser loginOperationUser = tokenService.getLoginOperationUser();
@@ -163,4 +162,13 @@
return xpTaskService.handleVehicleAccident(dto,xpOperationsUser);
}
+ /**
+ * 通过车辆id查询任务事故分页列表
+ * @return
+ */
+ @ApiOperation(value = "通过车辆id查询任务事故分页列表", tags = {"管理后台-车辆管理-运营车辆管理"})
+ @PostMapping("/api/v1/vehicle/queryTaskByVehicleId")
+ public R<PageInfo<XpTaskRecordVO>> queryTaskByVehicleId(@Valid @RequestBody XpTaskRecordPageQuery query) {
+ return R.ok(xpTaskService.queryTaskByVehicleId(query));
+ }
}
--
Gitblit v1.7.1