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/XpTaskManagementController.java

@@ -18,6 +18,9 @@
import com.xiaopeng.common.core.utils.WebUtils;
import com.xiaopeng.common.core.utils.ip.IpUtils;
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;
@@ -54,6 +57,9 @@
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
import com.xiaopeng.common.log.annotation.AdminOperationLog;
import com.xiaopeng.common.log.enums.AdminBusinessType;
import com.xiaopeng.common.log.enums.AdminOperationType;

/**
 * <p>
@@ -96,6 +102,12 @@

    @ApiOperation(value = "任务工单导出")
    @PostMapping(value = "/exportExcel")
    @AdminOperationLog(
            businessType = AdminBusinessType.TASK_ORDER_MANAGEMENT,
            operationType = AdminOperationType.EXPORT,
            content = "导出任务工单",
            appendRequestData = true
    )
    public void exportExcel(@RequestBody TaskManagementPageListQuery query) {
        List<TaskManagementPageListVO> exportList = xpTaskService.exportList(query);
        List<XpTaskExportExcel> taskExportExcels = new ArrayList<>();
@@ -158,6 +170,12 @@
     */
    @ApiOperation(value = "删除任务/事故")
    @DeleteMapping("/deleteTaskById")
    @AdminOperationLog(
            businessType = AdminBusinessType.TASK_ORDER_MANAGEMENT,
            operationType = AdminOperationType.DELETE,
            contentExpression = "'删除任务/事故,id=' + #p0",
            appendRequestData = false
    )
    public R<?> deleteTaskById(@ApiParam(name = "id", value = "任务ID") Long id) {
        xpTaskService.deleteTaskById(id);
        return R.ok();
@@ -165,6 +183,12 @@

    @ApiOperation(value = "任务分配")
    @GetMapping("/assigneeTask")
    @AdminOperationLog(
            businessType = AdminBusinessType.TASK_ORDER_MANAGEMENT,
            operationType = AdminOperationType.EDIT,
            contentExpression = "'任务分配,id=' + #p0 + ',handlerUserId=' + #p1",
            appendRequestData = false
    )
    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);
@@ -172,21 +196,15 @@

    @ApiOperation(value = "创建任务事故")
    @PostMapping("/saveTask")
    @AdminOperationLog(
            businessType = AdminBusinessType.TASK_ORDER_MANAGEMENT,
            operationType = AdminOperationType.ADD,
            contentExpression = "'创建任务事故,vehicleIds=' + #p0.vehicleIds + ',taskTypeId=' + #p0.taskTypeId",
            appendRequestData = false
    )
    public R saveTask(@RequestBody SaveErrorTaskDto dto) {
        Long reportUserId = tokenService.getLoginUser().getSysUser().getId();
        xpTaskService.saveTask(dto, reportUserId);
        return R.ok();
    }


    /**
     * 内部调用-添加车辆异常任务
     * @param vehicleId
     * @return
     */
    @PostMapping("/saveVehicleAccidentError")
    public R saveVehicleAccidentError(@RequestParam Long vehicleId) {
        xpTaskService.saveVehicleAccidentError(vehicleId);
        return R.ok();
    }

@@ -208,7 +226,12 @@
            if (org.apache.commons.lang3.StringUtils.isNotBlank(vehiclePictures)) {
                JSONObject jsonObject = JSONObject.parseObject(vehiclePictures);
                //1
                String downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
                    String downloadUrl = jsonObject.getString("url");;
                try {
                    downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true);
                } catch (UnsupportedEncodingException e) {
                    log.error("获取图片下载地址失败", e);
                }
                jsonObject.put("url", downloadUrl);
                vehicle.setVehiclePictures(jsonObject.toJSONString());
            }