From 1e40a2d344a407043edb569f000b02e7369b35e8 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Mon, 14 Jul 2025 16:11:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AEnick=5Fname=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/FadAppAuthController.java | 20 +++++++++ .../ruoyi/fadapp/domain/vo/NickDeptVo.java | 9 ++++ .../fadapp/service/IFadAppAuthService.java | 17 +++++++ .../service/impl/FadAppAuthServiceImpl.java | 45 ++++++++++++++++++- .../ruoyi/system/mapper/SysUserMapper.java | 6 +++ .../ruoyi/system/service/ISysUserService.java | 7 +++ .../service/impl/SysUserServiceImpl.java | 5 +++ .../resources/mapper/system/SysUserMapper.xml | 5 +++ 8 files changed, 113 insertions(+), 1 deletion(-) create mode 100644 fad-app/src/main/java/com/ruoyi/fadapp/domain/vo/NickDeptVo.java diff --git a/fad-app/src/main/java/com/ruoyi/fadapp/controller/FadAppAuthController.java b/fad-app/src/main/java/com/ruoyi/fadapp/controller/FadAppAuthController.java index dca1739..21676c4 100644 --- a/fad-app/src/main/java/com/ruoyi/fadapp/controller/FadAppAuthController.java +++ b/fad-app/src/main/java/com/ruoyi/fadapp/controller/FadAppAuthController.java @@ -11,6 +11,8 @@ import org.springframework.web.bind.annotation.*; import javax.validation.Valid; import javax.validation.constraints.NotBlank; +import java.util.List; +import com.ruoyi.fadapp.domain.vo.NickDeptVo; /** * FAD APP认证控制器 @@ -51,4 +53,22 @@ public class FadAppAuthController { authService.logout(token); return R.ok(); } + + /** + * 根据用户名查部门名称 + */ + @GetMapping("/dept-name") + public R getDeptNameByUserName(@RequestParam String userName) { + String deptName = authService.getDeptNameByUserName(userName); + return R.ok(deptName); + } + + /** + * 批量根据昵称查询部门名称 + */ + @PostMapping("/dept-names-by-nicks") + public R> getDeptNamesByNickNames(@RequestBody List nickNames) { + List result = authService.getDeptNamesByNickNames(nickNames); + return R.ok(result); + } } \ No newline at end of file diff --git a/fad-app/src/main/java/com/ruoyi/fadapp/domain/vo/NickDeptVo.java b/fad-app/src/main/java/com/ruoyi/fadapp/domain/vo/NickDeptVo.java new file mode 100644 index 0000000..a958aff --- /dev/null +++ b/fad-app/src/main/java/com/ruoyi/fadapp/domain/vo/NickDeptVo.java @@ -0,0 +1,9 @@ +package com.ruoyi.fadapp.domain.vo; + +import lombok.Data; + +@Data +public class NickDeptVo { + private String nickName; + private String deptName; +} \ No newline at end of file diff --git a/fad-app/src/main/java/com/ruoyi/fadapp/service/IFadAppAuthService.java b/fad-app/src/main/java/com/ruoyi/fadapp/service/IFadAppAuthService.java index e43611f..1782837 100644 --- a/fad-app/src/main/java/com/ruoyi/fadapp/service/IFadAppAuthService.java +++ b/fad-app/src/main/java/com/ruoyi/fadapp/service/IFadAppAuthService.java @@ -1,6 +1,8 @@ package com.ruoyi.fadapp.service; import com.ruoyi.fadapp.domain.vo.LoginResultVo; +import com.ruoyi.fadapp.domain.vo.NickDeptVo; +import java.util.List; /** * FAD APP认证服务接口 @@ -31,4 +33,19 @@ public interface IFadAppAuthService { * @param token 访问令牌 */ void logout(String token); + + /** + * 根据用户名查部门名称 + */ + String getDeptNameByUserName(String userName); + + /** + * 根据昵称查部门名称 + */ + String getDeptNameByNickName(String nickName); + + /** + * 批量根据昵称查部门名称 + */ + List getDeptNamesByNickNames(List nickNames); } \ No newline at end of file diff --git a/fad-app/src/main/java/com/ruoyi/fadapp/service/impl/FadAppAuthServiceImpl.java b/fad-app/src/main/java/com/ruoyi/fadapp/service/impl/FadAppAuthServiceImpl.java index 8d54233..da555c9 100644 --- a/fad-app/src/main/java/com/ruoyi/fadapp/service/impl/FadAppAuthServiceImpl.java +++ b/fad-app/src/main/java/com/ruoyi/fadapp/service/impl/FadAppAuthServiceImpl.java @@ -11,6 +11,7 @@ import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.helper.LoginHelper; import com.ruoyi.common.utils.redis.RedisUtils; import com.ruoyi.fadapp.domain.vo.LoginResultVo; +import com.ruoyi.fadapp.domain.vo.NickDeptVo; import com.ruoyi.fadapp.service.IFadAppAuthService; import com.ruoyi.system.service.ISysUserService; import com.ruoyi.system.service.SysPermissionService; @@ -20,6 +21,7 @@ import org.springframework.stereotype.Service; import java.time.Duration; import java.util.List; +import java.util.ArrayList; /** * FAD APP认证服务实现类 @@ -113,8 +115,8 @@ public class FadAppAuthServiceImpl implements IFadAppAuthService { result.setPhonenumber(user.getPhonenumber()); result.setAvatar(user.getAvatar()); result.setDeptId(user.getDeptId()); + result.setDeptName(user.getDept() != null ? user.getDept().getDeptName() : ""); // 这里可以设置部门名称，需要查询部门信息 - return result; } @@ -182,4 +184,45 @@ public class FadAppAuthServiceImpl implements IFadAppAuthService { loginUser.setRoles(roles); return loginUser; } + + @Override + public String getDeptNameByUserName(String userName) { + SysUser user = userService.selectUserByUserName(userName); + if (user == null) { + throw new ServiceException("用户不存在"); + } + if (user.getDept() != null) { + return user.getDept().getDeptName(); + } + return ""; + } + + @Override + public String getDeptNameByNickName(String nickName) { + SysUser user = userService.selectUserByNickName(nickName); + if (user == null) { + throw new ServiceException("用户不存在"); + } + if (user.getDept() != null) { + return user.getDept().getDeptName(); + } + return ""; + } + + @Override + public List getDeptNamesByNickNames(List nickNames) { + List result = new ArrayList<>(); + for (String nick : nickNames) { + SysUser user = userService.selectUserByNickName(nick); + NickDeptVo vo = new NickDeptVo(); + vo.setNickName(nick); + if (user != null && user.getDept() != null) { + vo.setDeptName(user.getDept().getDeptName()); + } else { + vo.setDeptName(""); + } + result.add(vo); + } + return result; + } } \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java index 6b7ed47..19c50d2 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java @@ -114,5 +114,11 @@ public interface SysUserMapper extends BaseMapperPlus selectListAndNotDel(); + /** + * 通过昵称查询用户 + * @param nickName 昵称 + * @return 用户对象信息 + */ + SysUser selectUserByNickName(String nickName); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java index 9482f9f..25ca3ac 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java @@ -83,6 +83,13 @@ public interface ISysUserService { */ SysUser selectUserByIdAndNotDelFlag(Long userId); + /** + * 通过昵称查询用户 + * @param nickName 昵称 + * @return 用户对象信息 + */ + SysUser selectUserByNickName(String nickName); + /** * 根据用户ID查询用户所属角色组 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java index 1b8974b..b50f8e8 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java @@ -526,4 +526,9 @@ public class SysUserServiceImpl implements ISysUserService, UserService { return ObjectUtil.isNull(sysUser) ? null : sysUser.getNickName(); } + @Override + public SysUser selectUserByNickName(String nickName) { + return baseMapper.selectUserByNickName(nickName); + } + } diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index 3132a34..dcaa5cf 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -192,6 +192,11 @@ where u.del_flag = '0' and u.email = #{email} + +