Merge remote-tracking branch 'origin/master'

xuhy

2026-03-13 606841e8477fe937e7d8afa9f30d5f633887eca2

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

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.xiaopeng.api.feignClient.account.XpOperationUserClient;
import com.xiaopeng.api.feignClient.vehicleConvoy.XpVehicleClient;
import com.xiaopeng.api.model.account.XpOperationsUser;
import com.xiaopeng.api.model.maintenance.XpVehicleClean;
import com.xiaopeng.api.query.maintenance.VehicleCleanQuery;
import com.xiaopeng.common.core.domain.R;
@@ -22,6 +23,9 @@
import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

import java.util.List;
import java.util.stream.Collectors;

/**
 * <p>
@@ -84,7 +88,40 @@
    @PostMapping("/api/v1/vehicleClean/list")
    public R<PageInfo<XpVehicleClean>> list(@RequestBody VehicleCleanQuery query) {
        PageInfo<XpVehicleClean> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        PageInfo<XpVehicleClean> page = xpVehicleCleanService.page(pageInfo, new LambdaQueryWrapper<XpVehicleClean>().eq(XpVehicleClean::getVehicleId, query.getVehicleId()).orderByDesc(BaseModel::getCreateTime));
        LambdaQueryWrapper<XpVehicleClean> wrapper = new LambdaQueryWrapper<XpVehicleClean>().eq(XpVehicleClean::getVehicleId, query.getVehicleId());
        List<XpOperationsUser> data=null;
        if(query.getOperationUserName()!=null && !query.getOperationUserName().isEmpty()){
            R<List<XpOperationsUser>> r = xpOperationUserClient.listByName(query.getOperationUserName());
            if(r.getCode()!=200 || r.getData().isEmpty()){
                return R.ok(pageInfo);
            }
            data = r.getData();
            wrapper.in(XpVehicleClean::getOperationsUserId, data.stream().map(XpOperationsUser::getId).collect(Collectors.toList()));

        }
        if(query.getStartTime()!=null && !query.getStartTime().isEmpty() && query.getEndTime()!=null && !query.getEndTime().isEmpty()){
            wrapper.between(XpVehicleClean::getCreateTime, query.getStartTime(), query.getEndTime());
        }

        PageInfo<XpVehicleClean> page = xpVehicleCleanService.page(pageInfo, wrapper.orderByDesc(BaseModel::getCreateTime));
        List<XpVehicleClean> records = page.getRecords();
        if(data==null){
            List<Long> userIds = records.stream().map(XpVehicleClean::getOperationsUserId).collect(Collectors.toList());
            if(userIds.isEmpty()){
                return R.ok(page);
            }

            R<List<XpOperationsUser>> r = xpOperationUserClient.listByIds(userIds);
            if(r.getData().isEmpty()){
                return R.ok(page);
            }
            data = r.getData();
        }


        for (XpVehicleClean record : records) {
            data.stream().filter(xpOperationsUser -> xpOperationsUser.getId().equals(record.getOperationsUserId())).findFirst().ifPresent(xpOperationsUser -> record.setCreateBy(xpOperationsUser.getNickName()));
        }
        return R.ok(page);
    }