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

puzhibing

2026-04-23 605159b6864baa969f897467a08bd2f1b54f6d87

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

 xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPointSituationReportServiceImpl.java

@@ -4,12 +4,14 @@
import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.xiaopeng.api.dto.account.XpOperationsUserQueryDTO;
import com.xiaopeng.api.feignClient.account.XpOperationUserClient;
import com.xiaopeng.api.feignClient.vehicleConvoy.XpFleetOperationsClient;
import com.xiaopeng.api.model.account.XpOperationsUser;
import com.xiaopeng.api.model.operation.XpPointSituationReport;
import com.xiaopeng.api.model.vehicleConvoy.XpFleet;
import com.xiaopeng.api.query.operation.XpPointSituationReportQuery;
import com.xiaopeng.api.vo.account.XpOperationsUserWithRoleVO;
import com.xiaopeng.api.vo.operation.XpPointSituationReportVo;
import com.xiaopeng.common.core.domain.R;
import com.xiaopeng.common.core.exception.ServiceException;
@@ -23,6 +25,7 @@

import javax.annotation.Resource;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;


@@ -109,17 +112,20 @@
        XpPointSituationReportVo bean = list.get(0);

        // 批量查询操作人信息
        R<List<XpOperationsUser>> userResult = xpOperationUserClient.listByIds(new ArrayList<Long>(){{
        XpOperationsUserQueryDTO queryOu = new XpOperationsUserQueryDTO();
        queryOu.setIds(new ArrayList<Long>(){{
            add(bean.getOperationsUserId());
        }} );
        List<XpOperationsUser> users = userResult.getData();
        R<List<XpOperationsUserWithRoleVO>> userResult = xpOperationUserClient.findList(queryOu);
        List<XpOperationsUserWithRoleVO> users = userResult.getData();
        if (CollectionUtils.isEmpty(users)) {
            throw new ServiceException("未查询该运维人员");
        }
        Map<Long, String> userNameMap = users.stream()
                .collect(Collectors.toMap(XpOperationsUser::getId, XpOperationsUser::getNickName));
        Map<Long, XpOperationsUserWithRoleVO> userNameMap = users.stream()
                .collect(Collectors.toMap(XpOperationsUser::getId, Function.identity()));

        bean.setOperationsUserName(userNameMap.get(bean.getOperationsUserId()));
        bean.setOperationsUserName(userNameMap.get(bean.getOperationsUserId()).getNickName());
        bean.setOperationsUserRoleName(userNameMap.get(bean.getOperationsUserId()).getRoleName());

        R<List<XpFleet>> fleetByUserId = xpFleetOperationsClient.getFleetByUserId(bean.getOperationsUserId());
        if(fleetByUserId.getCode() != R.SUCCESS || fleetByUserId.getData().isEmpty()){