Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi in...

liujie

2026-06-09 c96fbe6b0aeb413a17c429133ee6d81d138144b9

 xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpTaskController.java

@@ -26,10 +26,15 @@
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;
import com.xiaopeng.common.log.enums.AdminOperationType;
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;
@@ -43,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;
@@ -68,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;
@@ -83,6 +95,7 @@
 */
@RestController
@Slf4j
@Api(tags = "任务管理")
public class XpTaskController {
    @Resource
    private XpTaskService xpTaskService;
@@ -166,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();
@@ -203,6 +217,8 @@
        }
        return R.ok();
    }



    @ApiOperation(value = "车辆事故任务详情", tags = "运维APP-任务中心")
    @GetMapping("/maintenance-app/api/v1/task/vehicleAccidentDetail")
@@ -283,6 +299,12 @@
     */
    @ApiOperation(value = "删除删除任务/事故", tags = {"管理后台-车辆管理-运营车辆管理"})
    @DeleteMapping("/api/v1/task/delete/{id}")
    @AdminOperationLog(
            businessType = AdminBusinessType.TASK_ORDER_MANAGEMENT,
            operationType = AdminOperationType.DELETE,
            contentExpression = "'删除任务/事故,id=' + #p0",
            appendRequestData = false
    )
    public R<?> deleteTaskById(@ApiParam(name = "id", value = "任务ID") @PathVariable Long id) {
        xpTaskService.deleteTaskById(id);
        return R.ok();
@@ -333,6 +355,12 @@

    @ApiOperation(value = "待改派的工单导出", tags = {"管理后台-运维执行-任务工单-待改派工单"})
    @PostMapping("/api/v1/task/reassign/export")
    @AdminOperationLog(
            businessType = AdminBusinessType.TASK_ORDER_MANAGEMENT,
            operationType = AdminOperationType.EXPORT,
            content = "导出待改派工单",
            appendRequestData = true
    )
    public R<?> export(@RequestBody TaskPageListQuery query, HttpServletResponse response) {
        List<XpTaskVO> list = xpTaskService.exportList(query);
        Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), XpCruiseCheckInRecordVO.class, list);
@@ -380,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("未查询到运维人员");
@@ -424,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());
@@ -452,8 +480,39 @@
    }



    @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(
            businessType = AdminBusinessType.TASK_ORDER_MANAGEMENT,
            operationType = AdminOperationType.EDIT,
            contentExpression = "'运营后台改派工单,taskId=' + #p0.taskId + ',newOperationsUserId=' + #p0.newOperationsUserId",
            appendRequestData = false
    )
    public R<?> taskReassignment(@RequestBody TaskReassignmentVo vo){
        xpTaskService.taskReassignment(vo);
        return R.ok();