Merge remote-tracking branch 'origin/1.0' into 1.0

puzhibing

2026-04-17 96dd6e39667c24fe29647d0f65be634bc224c78b

Merge remote-tracking branch 'origin/1.0' into 1.0

 xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/maintenance/XpTask.java

@@ -1,6 +1,7 @@
package com.xiaopeng.api.model.maintenance;

import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
import com.xiaopeng.common.core.web.domain.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -11,6 +12,7 @@

import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;

/**
 * <p>
@@ -23,7 +25,7 @@
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("xp_task")
@TableName(value = "xp_task", autoResultMap = true)
@ApiModel(value = "XpTask对象", description = "任务管理")
public class XpTask extends BaseModel {

@@ -96,4 +98,8 @@

    @ApiModelProperty(value = "任务来源 1-运维APP 2-管理后台")
    private Integer taskSource;

    @ApiModelProperty(value = "申请改派的用户id")
    @TableField(typeHandler = JacksonTypeHandler.class)
    private List<Long> excluded;
}

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

@@ -101,6 +101,13 @@
        return R.ok(pageList);
    }

    @ApiOperation(value = "工单改派", tags = "运维APP-任务中心")
    @PostMapping("/maintenance-app/api/v1/task/pageList")
    public R<?> reassign(@RequestParam("taskId") Long taskId, @RequestParam("comment") String comment) {
        xpTaskService.reassign(taskId, comment);
        return R.ok();
    }

    @ApiOperation(value = "事故任务确认到达", tags = "运维APP-任务中心")
    @GetMapping("/maintenance-app/api/v1/task/confirmArrive")
    public R confirmArrive(Long id) {

 xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/XpTaskService.java

@@ -95,5 +95,7 @@
     */
    XpTask queryInfoByVehicleId(Long vehicleId);

    void reassign(Long taskId, String msg);

    void saveVehicleAccidentError(Long vehicleI);
}

 xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpTaskServiceImpl.java

@@ -1371,7 +1371,9 @@
    @Autowired
    private XpOperationsUserRepository repository;

    public void reassign(Long taskId,String msg) {
    @Override
    @Transactional
    public void reassign(Long taskId, String msg) {

        XpTask task = getById(taskId);
        XpVehicle vehicle = xpVehicleClient.queryById(task.getVehicleId()).getData();
@@ -1380,15 +1382,19 @@
        if (Objects.isNull(taskRuleRole) || Objects.isNull(taskRule)) {
            throw new ServiceException("未配置车辆事故任务分配规则");
        }
        List<Long> excludedUserIds = Optional.ofNullable(task.getExcluded()).orElse(new ArrayList<>());
        excludedUserIds.add(Long.valueOf(task.getHandleUserId()));
        task.setExcluded(excludedUserIds);
        Long fleetId = xpFleetVehicleClient.getFleetIdByVehicleId(vehicle.getId()).getData();
        List<Long> roleIds = taskRuleRole.stream().map(XpTaskRuleRole::getRoleId).collect(Collectors.toList());
        List<XpOperationsRole> data = xpOperationUserClient.getXpOperationsRoleByRoleIds(roleIds).getData();
        List<Long> ids = xpFleetOperationsClient.getOperationsIdsByFleetId(fleetId).getData();
        List<XpOperationsRole> collect = data.stream().filter(x -> ids.contains(x.getOperationsUserId())).collect(Collectors.toList());
        String belongUserIds = collect.stream().map(XpOperationsRole::getOperationsUserId).collect(Collectors.toSet()).stream().map(String::valueOf).collect(Collectors.joining(","));
        String idsWithoutMe = belongUserIds.replace(task.getHandleUserId(), "");
        String belongUserIds = xpOperationUserClient.getXpOperationsRoleByRoleIds(roleIds).getData().stream()
                .map(XpOperationsRole::getOperationsUserId)
                .filter(ids::contains)
                .filter(id -> !excludedUserIds.contains(id))
                .map(String::valueOf).collect(Collectors.joining(","));
        VehiclePosition vehiclePosition = mongoTemplate.findOne(new Query(Criteria.where("vin").is(vehicle.getVehicleVin())), VehiclePosition.class);
        String handlerUser = chooseNearestAvailableOperationsUser(idsWithoutMe, vehiclePosition);
        String handlerUser = chooseNearestAvailableOperationsUser(belongUserIds, vehiclePosition);
        task.setHandleUserId(handlerUser);
        if(handlerUser == null) {
            task.setStatus(4);
@@ -1414,10 +1420,11 @@
        }
        Long fleetId = xpFleetVehicleClient.getFleetIdByVehicleId(vehicle.getId()).getData();
        List<Long> roleIds = taskRuleRole.stream().map(XpTaskRuleRole::getRoleId).collect(Collectors.toList());
        List<XpOperationsRole> data = xpOperationUserClient.getXpOperationsRoleByRoleIds(roleIds).getData();
        List<Long> ids = xpFleetOperationsClient.getOperationsIdsByFleetId(fleetId).getData();
        List<XpOperationsRole> collect = data.stream().filter(x -> ids.contains(x.getOperationsUserId())).collect(Collectors.toList());
        String belongUserIds = collect.stream().map(XpOperationsRole::getOperationsUserId).collect(Collectors.toSet()).stream().map(String::valueOf).collect(Collectors.joining(","));
        String belongUserIds = xpOperationUserClient.getXpOperationsRoleByRoleIds(roleIds).getData().stream()
                .map(XpOperationsRole::getOperationsUserId)
                .filter(ids::contains)
                .map(String::valueOf).collect(Collectors.joining(","));

        VehiclePosition vehiclePosition = mongoTemplate.findOne(new Query(Criteria.where("vin").is(vehicle.getVehicleVin())), VehiclePosition.class);
        Map<String, String> geocode = gdMapGeocodingUtil.geocode(vehiclePosition.getPoint().getX() + "", vehiclePosition.getPoint().getY() + "");
@@ -1477,6 +1484,7 @@

    private String chooseNearestAvailableOperationsUser(String belongUserIds, VehiclePosition vehiclePosition) {

        if (StringUtils.isBlank(belongUserIds)) return null;
        List<Long> ids = Arrays.stream(belongUserIds.split(",")).filter(StringUtils::isNotBlank).map(Long::valueOf).collect(Collectors.toList());

        // 让mongo根据[id in ids]返回距离排序的users