运维修改，车辆修改

xuhy

2026-03-19 87b26ba8821ee5c46a1e272fb86544c5160dae74

运维修改，车辆修改

 xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/mapper/XpChargingRecordMapper.java

@@ -2,6 +2,7 @@

import com.xiaopeng.api.model.maintenance.XpChargingRecord;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.xiaopeng.common.core.web.page.PageInfo;
import com.xiaopeng.maintenance.model.query.OperationRecordsQuery;
import com.xiaopeng.maintenance.model.vo.OperationRecordsVO;
import org.apache.ibatis.annotations.Param;
@@ -24,5 +25,5 @@
     * @param query 查询参数
     * @return 充电记录列表
     */
    List<OperationRecordsVO> operationRecords(@Param("query") OperationRecordsQuery query);
    List<OperationRecordsVO> operationRecords(@Param("query") OperationRecordsQuery query,@Param("pageInfo") PageInfo<OperationRecordsVO> pageInfo);
}

 xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/mapper/XpVehicleCleanMapper.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.xiaopeng.api.model.maintenance.XpVehicleClean;
import com.xiaopeng.common.core.web.page.PageInfo;
import com.xiaopeng.maintenance.model.query.OperationRecordsQuery;
import com.xiaopeng.maintenance.model.vo.OperationRecordsVO;
import org.apache.ibatis.annotations.Param;
@@ -24,5 +25,5 @@
     * @param query 查询参数
     * @return 清洁记录列表
     */
    List<OperationRecordsVO> operationRecords(@Param("query") OperationRecordsQuery query);
    List<OperationRecordsVO> operationRecords(@Param("query") OperationRecordsQuery query,@Param("pageInfo") PageInfo<OperationRecordsVO> pageInfo);
}

 xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/mapper/XpVehicleDetectionMapper.java

@@ -2,6 +2,7 @@

import com.xiaopeng.api.model.maintenance.XpVehicleDetection;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.xiaopeng.common.core.web.page.PageInfo;
import com.xiaopeng.maintenance.model.query.OperationRecordsQuery;
import com.xiaopeng.maintenance.model.vo.OperationRecordsVO;
import org.apache.ibatis.annotations.Param;
@@ -24,5 +25,5 @@
     * @param query 查询参数
     * @return 列表
     */
    List<OperationRecordsVO> operationRecords(@Param("query") OperationRecordsQuery query);
    List<OperationRecordsVO> operationRecords(@Param("query") OperationRecordsQuery query,@Param("pageInfo") PageInfo<OperationRecordsVO> pageInfo);
}

 xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/mapper/XpVehiclePreparationMapper.java

@@ -2,6 +2,7 @@

import com.xiaopeng.api.model.maintenance.XpVehiclePreparation;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.xiaopeng.common.core.web.page.PageInfo;
import com.xiaopeng.maintenance.model.query.OperationRecordsQuery;
import com.xiaopeng.maintenance.model.vo.OperationRecordsVO;
import org.apache.ibatis.annotations.Param;
@@ -24,6 +25,6 @@
     * @param query 查询参数
     * @return 整备记录列表
     */
    List<OperationRecordsVO> operationRecords(@Param("query") OperationRecordsQuery query);
    List<OperationRecordsVO> operationRecords(@Param("query") OperationRecordsQuery query,@Param("pageInfo") PageInfo<OperationRecordsVO> pageInfo);

}

 xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/mapper/XpVehicleRepairMapper.java

@@ -2,6 +2,7 @@

import com.xiaopeng.api.model.maintenance.XpVehicleRepair;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.xiaopeng.common.core.web.page.PageInfo;
import com.xiaopeng.maintenance.model.query.OperationRecordsQuery;
import com.xiaopeng.maintenance.model.vo.OperationRecordsVO;
import org.apache.ibatis.annotations.Param;
@@ -24,5 +25,5 @@
     * @param query 查询参数
     * @return 运维记录列表
     */
    List<OperationRecordsVO> operationRecords(@Param("query") OperationRecordsQuery query);
    List<OperationRecordsVO> operationRecords(@Param("query") OperationRecordsQuery query,@Param("pageInfo") PageInfo<OperationRecordsVO> pageInfo);
}

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

@@ -70,11 +70,11 @@
        switch (query.getOperationType()) {
            case 1:
                // 整备记录
                operationRecords = xpVehiclePreparationMapper.operationRecords(query);
                operationRecords = xpVehiclePreparationMapper.operationRecords(query,pageInfo);
                break;
            case 2:
                // 充电记录
                operationRecords = xpChargingRecordMapper.operationRecords(query);
                operationRecords = xpChargingRecordMapper.operationRecords(query,pageInfo);
                if(!CollectionUtils.isEmpty(operationRecords)){
                    for (OperationRecordsVO operationRecord : operationRecords) {
                        operationRecord.setStartMileageRange(Objects.isNull(operationRecord.getStartMileageRange())?0.0f:operationRecord.getStartMileageRange());
@@ -84,15 +84,15 @@
                break;
            case 3:
                // 检测记录
                operationRecords = xpVehicleDetectionMapper.operationRecords(query);
                operationRecords = xpVehicleDetectionMapper.operationRecords(query,pageInfo);
                break;
            case 4:
                // 维修记录
                operationRecords = xpVehicleRepairMapper.operationRecords(query);
                operationRecords = xpVehicleRepairMapper.operationRecords(query,pageInfo);
                break;
            default:
                // 清洁记录
                operationRecords = xpVehicleCleanMapper.operationRecords(query);
                operationRecords = xpVehicleCleanMapper.operationRecords(query,pageInfo);
                break;
        }


 xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/service/impl/XpVehicleServiceImpl.java

@@ -182,7 +182,7 @@
            return pageInfo;
        }

        List<Long> vehicleIds = xpFleetVehicles.stream().map(XpFleetVehicle::getVehicleId).collect(Collectors.toList());
        List<Long> vehicleIds = xpFleetVehicles.stream().map(XpFleetVehicle::getVehicleId).distinct().collect(Collectors.toList());
        query.setVehicleIds(vehicleIds);