fix:联调修改

“mitao”

2026-02-13 c2f1fec459cfd4341a7c28bd4573a5d9aeee3ab5

fix:联调修改

 xp-robotaxi-vehicleConvoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/model/query/VehicleSelectPageQuery.java

New file
@@ -0,0 +1,24 @@
package com.xiaopeng.vehicleConvoy.model.query;

import com.xiaopeng.common.core.web.page.BasePage;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;

/**
 * 车队分页查询参数
 *
 * @author mitao
 */
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "车队分页查询参数")
public class VehicleSelectPageQuery extends BasePage {

    @ApiModelProperty(value = "车队名称")
    private String fleetName;

    @ApiModelProperty(value = "车牌号")
    private String plateNumber;
}

 xp-robotaxi-vehicleConvoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/model/query/XpVehicleAnnualRecordPageQuery.java

@@ -4,7 +4,6 @@
import com.xiaopeng.common.core.web.page.BasePage;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import lombok.Data;
import lombok.EqualsAndHashCode;

@@ -19,7 +18,7 @@

@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "运营车辆管理分页查询参数")
@ApiModel(value = "运营车辆详情年检记录分页查询参数")
public class XpVehicleAnnualRecordPageQuery extends BasePage {

    @ApiModelProperty(value = "车辆ID")

 xp-robotaxi-vehicleConvoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/model/vo/FleetDetailVO.java

@@ -28,6 +28,9 @@
    @ApiModelProperty(value = "负责人姓名")
    private String operationsUserName;

    @ApiModelProperty(value = "负责人-手机号")
    private String phoneNumber;

    @ApiModelProperty(value = "打卡地id")
    private Long locationId;


 xp-robotaxi-vehicleConvoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/model/vo/FleetPageVO.java

@@ -43,4 +43,12 @@
    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime createTime;

    @ApiModelProperty(value = "电子围栏id")
    private Long electronicId;

    @ApiModelProperty(value = "打卡地id")
    private Long locationId;


}

 xp-robotaxi-vehicleConvoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/service/impl/XpFleetServiceImpl.java

@@ -6,9 +6,11 @@
import com.xiaopeng.api.dto.account.XpOperationsUserQueryDTO;
import com.xiaopeng.api.feignClient.account.XpOperationUserClient;
import com.xiaopeng.api.feignClient.operation.XpElectronicClient;
import com.xiaopeng.api.feignClient.operation.XpPointClient;
import com.xiaopeng.api.feignClient.vehicleConvoy.XpVehicleClient;
import com.xiaopeng.api.model.account.XpOperationsUser;
import com.xiaopeng.api.model.operation.XpElectronicFence;
import com.xiaopeng.api.model.operation.XpPoint;
import com.xiaopeng.api.model.vehicleConvoy.XpFleet;
import com.xiaopeng.api.model.vehicleConvoy.XpFleetOperations;
import com.xiaopeng.api.model.vehicleConvoy.XpFleetVehicle;
@@ -63,6 +65,8 @@
    private final XpVehicleClient xpVehicleClient;

    private final XpElectronicClient xpElectronicClient;

    private final XpPointClient xpPointClient;

    @Override
    public List<XpFleet> listByIds(List<Long> ids) {
@@ -240,6 +244,15 @@
            R<XpOperationsUser> userResult = xpOperationUserClient.queryById(fleet.getOperationsUserId());
            if (userResult.getData() != null) {
                vo.setOperationsUserName(userResult.getData().getNickName());
                vo.setPhoneNumber(userResult.getData().getPhoneNumber());
            }
        }

        // 6. 查询打卡地信息
        if (fleet.getLocationId() != null) {
            R<XpPoint> pointResult = xpPointClient.queryById(fleet.getLocationId());
            if (pointResult.getData() != null) {
                vo.setLocationName(pointResult.getData().getPointName());
            }
        }


 xp-robotaxi-vehicleConvoy-boot/src/main/resources/mapper/vehicleConvoy/XpVehicleMapper.xml

@@ -108,7 +108,7 @@
        </where>
        ORDER BY create_time DESC
    </select>
    <select id="getList" resultType="com.xiaopeng.vehicleConvoy.model.vo.XpVehicleVO">
    <select id="getVehiclePageList" resultType="com.xiaopeng.vehicleConvoy.model.vo.XpVehicleVO">
        select xv.id,
        xv.vehicle_code,
        xv.vehicle_vin,