From c96fbe6b0aeb413a17c429133ee6d81d138144b9 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 09 六月 2026 10:58:52 +0800
Subject: [PATCH] Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.0
---
xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpTaskController.java | 44 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 41 insertions(+), 3 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 a72e04b..182e651 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
@@ -26,6 +26,7 @@
import com.xiaopeng.api.vo.automaticPilot.VehiclePosition;
import com.xiaopeng.common.core.domain.R;
import com.xiaopeng.common.core.exception.ServiceException;
+import com.xiaopeng.common.core.utils.SensitiveDataCryptoUtil;
import com.xiaopeng.common.core.web.page.PageInfo;
import com.xiaopeng.common.log.annotation.AdminOperationLog;
import com.xiaopeng.common.log.enums.AdminBusinessType;
@@ -33,6 +34,7 @@
import com.xiaopeng.common.security.service.TokenService;
import com.xiaopeng.evi.oss.service.AliOssService;
import com.xiaopeng.maintenance.dto.HandleVehicleAccidentDto;
+import com.xiaopeng.maintenance.dto.SaveRemoteDrivingAccidentDto;
import com.xiaopeng.maintenance.dto.SaveRoutineDetailDto;
import com.xiaopeng.maintenance.dto.SaveVehicleAccidentDto;
import com.xiaopeng.maintenance.job.AccidentTaskQuartzScheduler;
@@ -46,6 +48,7 @@
import com.xiaopeng.maintenance.vo.*;
import com.xiaopeng.maintenance.vo.TaskCleanDetailVO;
import com.xiaopeng.maintenance.vo.TaskDetectionDetailVO;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
@@ -71,6 +74,12 @@
import javax.validation.Valid;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import com.xiaopeng.common.log.annotation.AdminOperationLog;
+import com.xiaopeng.common.log.enums.AdminBusinessType;
+import com.xiaopeng.common.log.enums.AdminOperationType;
import java.net.URLEncoder;
import java.util.*;
import java.util.function.Function;
@@ -86,6 +95,7 @@
*/
@RestController
@Slf4j
+@Api(tags = "任务管理")
public class XpTaskController {
@Resource
private XpTaskService xpTaskService;
@@ -169,7 +179,8 @@
VehicleListVO vehicleListVO = new VehicleListVO();
vehicleListVO.setId(xpVehicle.getId());
- VehiclePosition vehiclePosition = mongoTemplate.findOne(new Query(Criteria.where("vin").is(xpVehicle.getVehicleVin())), VehiclePosition.class);
+ String vin = SensitiveDataCryptoUtil.decryptIfPossible(xpVehicle.getVehicleVin());
+ VehiclePosition vehiclePosition = mongoTemplate.findOne(new Query(Criteria.where("vin").is(vin)), VehiclePosition.class);
if (vehiclePosition != null) {
double x = vehiclePosition.getPoint().getX();
double y = vehiclePosition.getPoint().getY();
@@ -206,6 +217,8 @@
}
return R.ok();
}
+
+
@ApiOperation(value = "车辆事故任务详情", tags = "运维APP-任务中心")
@GetMapping("/maintenance-app/api/v1/task/vehicleAccidentDetail")
@@ -395,7 +408,7 @@
int time = 10*60*1000;
Long oneMinuteAgo = System.currentTimeMillis() - time;
query.addCriteria(Criteria.where("updateTime").gte(oneMinuteAgo));
-
+
List<XpOperationsUserPositionDTO> vehiclePositions = mongoTemplate.find(query, XpOperationsUserPositionDTO.class);
if(CollUtil.isEmpty(vehiclePositions)){
throw new ServiceException("未查询到运维人员");
@@ -439,7 +452,7 @@
// 将查询结果转换为 Map，key 为 userId，value 为 XpFleetOperations 对象
Map<Long, XpFleetOperations> fleetOperationsMap = findListByUserIdsR.getData().stream()
.collect(Collectors.toMap(XpFleetOperations::getOperationsUserId, Function.identity()));
-
+
for (XpOperationsUserWithRoleVO record : ret.getRecords()) {
if(fleetOperationsMap.containsKey(record.getId())){
record.setFleetName(fleetOperationsMap.get(record.getId()).getFleetName());
@@ -467,6 +480,31 @@
}
+
+ @ApiOperation(value = "创建远程代驾事故任务", tags = "远程代驾")
+ @PostMapping("/logan/assistance/v1/task/saveRemoteDrivingAccident")
+ public R<?> saveRemoteDrivingAccident(@RequestBody SaveRemoteDrivingAccidentDto dto) {
+ XpTask task = xpTaskService.saveRemoteDrivingAccident(dto);
+ try {
+ XpTaskRule taskRule = xpTaskRuleMapper.selectOne(null);
+ Integer processingTimeLimit = taskRule == null ? null : taskRule.getProcessingTimeLimit();
+ accidentTaskQuartzScheduler.scheduleAccidentTimeoutJobs(task.getId(), task.getEndTime(), processingTimeLimit);
+ } catch (Exception e) {
+ log.error("远程代驾事故任务Quartz调度失败，taskId={}", task == null ? null : task.getId(), e);
+ }
+ return R.ok();
+ }
+
+
+ @ApiOperation(value = "事故类型列表", response = XpErrorType.class, tags = "远程代驾")
+ @GetMapping("/logan/assistance/v1/taskManagement/errorTypeList")
+ public R<List<XpErrorType>> getErrorTypeList() {
+ return xpErrorTypeService.errorTypeList();
+ }
+
+
+
+
@ApiOperation(value = "运营后台改派工单", tags = {"管理后台-运维执行-任务工单-待改派工单"})
@PostMapping("/api/v1/task/reassign/taskReassignment")
@AdminOperationLog(
--
Gitblit v1.7.1