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

@@ -3,6 +3,7 @@

import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
import com.alibaba.fastjson2.JSONObject;
import com.xiaopeng.api.feignClient.account.XpOperationUserClient;
import com.xiaopeng.api.feignClient.vehicleConvoy.XpFleetOperationsClient;
import com.xiaopeng.api.feignClient.vehicleConvoy.XpVehicleClient;
@@ -17,7 +18,11 @@
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;
import com.xiaopeng.maintenance.dto.SaveErrorTaskDto;
import com.xiaopeng.maintenance.dto.SaveRoutineDetailDto;
@@ -44,6 +49,7 @@
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
@@ -51,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>
@@ -74,7 +83,7 @@
    @Resource
    private XpOperationUserClient operationUserClient;
    @Resource
    private XpFleetOperationsClient xpFleetOperationsClient;
    private AliOssService aliOssService;
    @Resource
    private XpVehicleClient xpVehicleClient;

@@ -93,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<>();
@@ -155,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();
@@ -162,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);
@@ -169,37 +196,46 @@

    @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();
    }

    @ApiOperation(value = "任务详情")
    @GetMapping("/taskDetail")
    public R<TaskManagementDetailVO> taskDetail(Long id) {
    public R<TaskManagementDetailVO> taskDetail(Long id) throws UnsupportedEncodingException {
        return xpTaskService.taskDetail(id);
    }

    @ApiOperation(value = "查询车辆不分页列表")
    @PostMapping("/listVehicle")
    public R<List<XpVehicle>> listVehicle() {
    public R<List<XpVehicle>> listVehicle() throws UnsupportedEncodingException {
        List<XpVehicle> vehicles = xpVehicleClient.listVehicle().getData();
        if (vehicles == null) {
            return R.ok(new ArrayList<>());
        }
        for (XpVehicle vehicle : vehicles) {
            String vehiclePictures = vehicle.getVehiclePictures();
            if (org.apache.commons.lang3.StringUtils.isNotBlank(vehiclePictures)) {
                JSONObject jsonObject = JSONObject.parseObject(vehiclePictures);
                //1
                    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());
            }
        }
        return R.ok(vehicles);
    }