From 3fa90f498e1c81ac24cc367bb3ea7d4725de43a4 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 12 二月 2026 21:48:26 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi
---
xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XpOperationsUserController.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 57 insertions(+), 1 deletions(-)
diff --git a/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XpOperationsUserController.java b/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XpOperationsUserController.java
index 1c855f4..d488d32 100644
--- a/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XpOperationsUserController.java
+++ b/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XpOperationsUserController.java
@@ -1,12 +1,18 @@
package com.xiaopeng.account.controller;
+import com.xiaopeng.account.mapper.XpOperationsRoleMapper;
import com.xiaopeng.account.service.IXpOperationsUserService;
+import com.xiaopeng.api.dto.account.XpOperationsUserQueryDTO;
import com.xiaopeng.api.model.account.XpOperationsUser;
+import com.xiaopeng.api.vo.account.XpOperationsUserWithRoleVO;
import com.xiaopeng.common.core.domain.R;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -23,9 +29,12 @@
private final IXpOperationsUserService xpOperationsUserService;
+ private final XpOperationsRoleMapper xpOperationsRoleMapper;
+
@Autowired
- public XpOperationsUserController(IXpOperationsUserService xpOperationsUserService) {
+ public XpOperationsUserController(IXpOperationsUserService xpOperationsUserService, XpOperationsRoleMapper xpOperationsRoleMapper) {
this.xpOperationsUserService = xpOperationsUserService;
+ this.xpOperationsRoleMapper = xpOperationsRoleMapper;
}
/**
@@ -55,4 +64,51 @@
public R<List<XpOperationsUser>> listByName(@RequestBody String nickName) {
return R.ok(xpOperationsUserService.listByName(nickName));
}
+
+ /**
+ * 根据用户ID列表批量查询用户及角色信息（内部接口）
+ * @param ids 用户ID列表
+ * @return 用户及角色信息列表
+ */
+ @ApiOperation(value = "批量查询用户及角色信息", tags = {"内部接口"})
+ @PostMapping("/inner/xpOperationsUser/listByIdsWithRole")
+ public R<List<XpOperationsUserWithRoleVO>> listByIdsWithRole(@RequestBody List<Long> ids) {
+ if (CollectionUtils.isEmpty(ids)) {
+ return R.ok(new ArrayList<>());
+ }
+ List<XpOperationsUserWithRoleVO> result = xpOperationsRoleMapper.selectUsersWithRoleByIds(ids);
+ return R.ok(result);
+ }
+
+ /**
+ * 根据条件查询用户及角色信息（内部接口）
+ * @param dto 查询条件
+ * @return 用户及角色信息列表
+ */
+ @ApiOperation(value = "根据条件查询用户及角色信息", tags = {"内部接口"})
+ @PostMapping("/inner/xpOperationsUser/queryByConditions")
+ public R<List<XpOperationsUserWithRoleVO>> queryByConditions(@RequestBody XpOperationsUserQueryDTO dto) {
+ List<XpOperationsUserWithRoleVO> result = xpOperationsRoleMapper.selectUsersByConditions(
+ dto.getNickName(),
+ dto.getPhoneNumber(),
+ dto.getRoleId()
+ );
+ return R.ok(result);
+ }
+
+ /**
+ * 根据条件查询用户及角色信息
+ * @param dto 查询条件
+ * @return 用户及角色信息列表
+ */
+ @ApiOperation(value = "根据条件查询用户不分页列表", tags = {"管理后台-车队管理"})
+ @PostMapping("/api/v1/xpOperationsUser/queryByConditions")
+ public R<List<XpOperationsUserWithRoleVO>> getList(@RequestBody XpOperationsUserQueryDTO dto) {
+ List<XpOperationsUserWithRoleVO> result = xpOperationsRoleMapper.selectUsersByConditions(
+ dto.getNickName(),
+ dto.getPhoneNumber(),
+ dto.getRoleId()
+ );
+ return R.ok(result);
+ }
}
--
Gitblit v1.7.1