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

puzhibing

2026-04-20 f5560820431163db68ccea4c850fb90a0eebf467

 xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/account/XpOperationUserClient.java

@@ -1,7 +1,7 @@
package com.xiaopeng.api.feignClient.account;

import com.xiaopeng.api.dto.account.XpOperationsUserQueryDTO;
import com.xiaopeng.api.factory.account.XpAppUserClientFallbackFactory;
import com.xiaopeng.api.factory.account.XpOperationUserClientFallbackFactory;
import com.xiaopeng.api.model.account.XpOperationsRole;
import com.xiaopeng.api.model.account.XpOperationsUser;
import com.xiaopeng.api.vo.account.XpOperationsUserWithRoleVO;
@@ -13,6 +13,7 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;

import java.util.Collection;
import java.util.List;

/**
@@ -22,21 +23,21 @@
 */
@FeignClient(contextId = "XpOperationUserClient",
        value = ServiceNameConstantsEnum.XP_ACCOUNT_SERVICE,
        fallbackFactory = XpAppUserClientFallbackFactory.class)
        fallbackFactory = XpOperationUserClientFallbackFactory.class)
public interface XpOperationUserClient {
    /**
     * 根据ID列表批量查询运维用户信息
     * @param ids 用户ID列表
     * @return 用户列表
     */
    @PostMapping("/inner/xpOperationsUser/listByIds")
    R<List<XpOperationsUser>> listByIds(@RequestBody List<Long> ids);
    @PostMapping("/logan/inner/xpOperationsUser/listByIds")
    R<List<XpOperationsUser>> listByIds(@RequestBody Collection<Long> ids);

    /**
     * 根据ID查询运维用户信息
     * @return 用户列表
     */
    @GetMapping("/inner/xpOperationsUser/queryById")
    @GetMapping("/logan/inner/xpOperationsUser/queryById")
    R<XpOperationsUser> queryById(@RequestParam Long id);

    /**
@@ -44,7 +45,7 @@
     * @param nickName 昵称
     * @return 运维用户列表
     */
    @PostMapping("/inner/xpOperationsUser/listByName")
    @PostMapping("/logan/inner/xpOperationsUser/listByName")
    R<List<XpOperationsUser>> listByName(@RequestParam("nickName") String nickName);

    /**
@@ -52,7 +53,7 @@
     * @param ids 用户ID列表
     * @return 用户及角色信息列表
     */
    @PostMapping("/inner/xpOperationsUser/listByIdsWithRole")
    @PostMapping("/logan/inner/xpOperationsUser/listByIdsWithRole")
    R<List<XpOperationsUserWithRoleVO>> listByIdsWithRole(@RequestBody List<Long> ids);

    /**
@@ -60,7 +61,7 @@
     * @param dto 查询条件
     * @return 用户及角色信息列表
     */
    @PostMapping("/inner/xpOperationsUser/queryByConditions")
    @PostMapping("/logan/inner/xpOperationsUser/queryByConditions")
    R<List<XpOperationsUserWithRoleVO>> queryByConditions(@RequestBody XpOperationsUserQueryDTO dto);


@@ -69,6 +70,39 @@
     * @param roleId
     * @return
     */
    @GetMapping("/inner/xp-operations-role/getXpOperationsRoleByRoleId")
    @GetMapping("/logan/inner/xp-operations-role/getXpOperationsRoleByRoleId")
    R<List<XpOperationsRole>> getXpOperationsRoleByRoleId(@RequestParam("roleId") Long roleId);

    /**
     * 获取所有启用状态的运维用户
     * @return 启用状态的用户列表
     */
    @GetMapping("/logan/inner/xpOperationsUser/listAllEnabled")
    R<List<XpOperationsUser>> listAllEnabled();

    /**
     * 查询角色关联的运维人员
     * @param roleIds
     * @return
     */
    @PostMapping("/logan/inner/xp-operations-role/getXpOperationsRoleByRoleIds")
    R<List<XpOperationsRole>> getXpOperationsRoleByRoleIds(@RequestBody List<Long> roleIds);

    /**
     * 根据手机号模糊查询用户（内部接口）
     *
     * @param phoneNumber 手机号
     * @return 用户信息列表
     */
    @PostMapping("/logan/inner/xpOperationsUser/getByPhoneNumber")
    public R<List<XpOperationsUser>> getByPhoneNumber(@RequestParam String phoneNumber);

    /**
     * 根据手机号精确查询运维用户（内部接口）
     *
     * @param phoneNumber 手机号
     * @return 运维用户信息
     */
    @GetMapping("/logan/inner/xpOperationsUser/getByExactPhone")
    R<XpOperationsUser> getByExactPhone(@RequestParam("phoneNumber") String phoneNumber);
}