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/XpTaskController.java | 39 +++++++++++++++++++++++++++++----------
1 files changed, 29 insertions(+), 10 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 af174bf..cde62f6 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
@@ -61,11 +61,13 @@
private XpFleetOperationsClient xpFleetOperationsClient;
@Resource
private XpVehicleClient xpVehicleClient;
+
@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, tags = "运维APP-任务中心")
@PostMapping("/api/v1/task/pageList")
public R<PageInfo<TaskPageListVO>> pageList(@RequestBody TaskPageListQuery query) {
@@ -73,13 +75,15 @@
PageInfo<TaskPageListVO> pageList = xpTaskService.pageList(query);
return R.ok(pageList);
}
+
@ApiOperation(value = "事故任务确认到达", tags = "运维APP-任务中心")
@GetMapping("/api/v1/task/confirmArrive")
@Transactional
- public R confirmArrive( Long id) {
+ public R confirmArrive(Long id) {
Long userId = tokenService.getLoginOperationUser().getXpOperationsUser().getId();
- return xpTaskService.confirmArrive(id,userId);
+ return xpTaskService.confirmArrive(id, userId);
}
+
@ApiOperation(value = "查询车辆不分页列表", tags = "运维APP-任务中心")
@PostMapping("/api/v1/task/listVehicle")
public R<List<VehicleListVO>> listVehicle() {
@@ -89,21 +93,21 @@
// 查询当前人员所属车队 查询车队关联车辆
R<List<Long>> vehicleByUserId = xpFleetOperationsClient.getVehicleByUserId(xpOperationsUser.getId());
List<Long> vehicleIds = vehicleByUserId.getData();
- if (vehicleIds != null && !vehicleIds.isEmpty()){
+ if (vehicleIds != null && !vehicleIds.isEmpty()) {
List<XpVehicle> data = xpVehicleClient.listByIds(vehicleIds).getData();
- if (data!=null){
+ if (data != null) {
List<VehicleListVO> vehicleListVOS = new ArrayList<>();
for (XpVehicle xpVehicle : data) {
VehicleListVO vehicleListVO = new VehicleListVO();
vehicleListVO.setId(xpVehicle.getId());
VehiclePosition vehiclePosition = mongoTemplate.findOne(new Query(Criteria.where("vin").is(xpVehicle.getVehicleVin())), VehiclePosition.class);
- if(vehiclePosition!=null){
+ if (vehiclePosition != null) {
double x = vehiclePosition.getPoint().getX();
double y = vehiclePosition.getPoint().getY();
- vehicleListVO.setVehicleLon(x+"");
- vehicleListVO.setVehicleLat(y+"");
+ vehicleListVO.setVehicleLon(x + "");
+ vehicleListVO.setVehicleLat(y + "");
}
vehicleListVO.setVehicleCode(xpVehicle.getVehicleCode());
vehicleListVO.setVehicleColor(xpVehicle.getVehicleColor());
@@ -118,6 +122,7 @@
return R.ok(new ArrayList<>());
}
+
@ApiOperation(value = "上传车辆事故", tags = "运维APP-任务中心")
@PostMapping("/api/v1/task/saveVehicleAccident")
public R saveVehicleAccident(@RequestBody SaveVehicleAccidentDto dto) {
@@ -126,6 +131,7 @@
xpTaskService.saveVehicleAccident(dto, xpOperationsUser);
return R.ok();
}
+
@ApiOperation(value = "车辆事故任务详情", tags = "运维APP-任务中心")
@GetMapping("/api/v1/task/vehicleAccidentDetail")
public R<TaskAccidentDetailVO> vehicleAccidentDetail(Long id) {
@@ -137,6 +143,7 @@
public R<TaskRoutineDetailVO> vehicleRoutineDetail(Long id) {
return xpTaskService.vehicleRoutineDetail(id);
}
+
@ApiOperation(value = "上传车辆其他常规任务详情", tags = "运维APP-任务中心")
@PostMapping("/api/v1/task/saveRoutineDetail")
public R saveRoutineDetail(@RequestBody SaveRoutineDetailDto dto) {
@@ -144,6 +151,7 @@
Long id = loginOperationUser.getId();
return xpTaskService.saveRoutineDetail(dto, id);
}
+
@ApiOperation(value = "车辆常规充电任务详情", tags = "运维APP-任务中心")
@GetMapping("/api/v1/task/chargingDetail")
public R<TaskChargingDetailVO> chargingDetail(Long id) {
@@ -155,32 +163,37 @@
public R<com.xiaopeng.maintenance.vo.TaskRepairDetailVO> repairDetail(Long id) {
return xpTaskService.repairDetail(id);
}
+
@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 = "车辆常规检测任务详情", tags = "运维APP-任务中心")
@GetMapping("/api/v1/task/detectionDetail")
public R<com.xiaopeng.maintenance.vo.TaskDetectionDetailVO> detectionDetail(Long id) {
return xpTaskService.detectionDetail(id);
}
+
@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 = "处理车辆事故", tags = "运维APP-任务中心")
@PostMapping("/api/v1/task/handleVehicleAccident")
@Transactional
public R handleVehicleAccident(@RequestBody HandleVehicleAccidentDto dto) {
LoginOperationUser loginOperationUser = tokenService.getLoginOperationUser();
XpOperationsUser xpOperationsUser = loginOperationUser.getXpOperationsUser();
- return xpTaskService.handleVehicleAccident(dto,xpOperationsUser);
+ return xpTaskService.handleVehicleAccident(dto, xpOperationsUser);
}
/**
* 通过车辆id查询任务事故分页列表
+ *
* @return
*/
@ApiOperation(value = "通过车辆id查询任务事故分页列表", tags = {"管理后台-车辆管理-运营车辆管理"})
@@ -191,15 +204,17 @@
/**
* 管理后台-车辆管理-运营车辆管理-删除任务/事故
+ *
* @param id
* @return
*/
@ApiOperation(value = "删除删除任务/事故", tags = {"管理后台-车辆管理-运营车辆管理"})
@DeleteMapping("/api/v1/task/delete/{id}")
- public R<?> deleteTaskById(@ApiParam(name = "id", value = "任务ID") @PathVariable Long id){
+ public R<?> deleteTaskById(@ApiParam(name = "id", value = "任务ID") @PathVariable Long id) {
xpTaskService.deleteTaskById(id);
return R.ok();
}
+
@ApiOperation(value = "事故类型列表", response = XpErrorType.class, tags = "管理后台-车辆管理-运营车辆管理")
@GetMapping("/api/v1/task/errorTypeTreeList")
public R<List<XpErrorType>> errorTypeTreeList() {
@@ -208,11 +223,15 @@
/**
* 通过车辆id查询上一次保养记录
+ *
* @param vehicleId 车辆ID
*/
@GetMapping("/inner/xpTask/queryInfoByVehicleId")
- public R<XpTask> queryInfoByVehicleId(@RequestParam("vehicleId") Long vehicleId){
+ public R<XpTask> queryInfoByVehicleId(@RequestParam("vehicleId") Long vehicleId) {
XpTask xpTask = xpTaskService.queryInfoByVehicleId(vehicleId);
return R.ok(xpTask);
}
+
+
+
}
--
Gitblit v1.7.1